")
+ teamEl = teamTemplate team: e.team
@$el.append(teamEl)
- goldEl = teamEl.find('.gold-amount.team-' + e.team)
- goldEl.text(e.gold)
+ goldEl = $('.gold-amount.team-' + e.team, teamEl)
+ text = '' + e.gold
+ if e.goldEarned and e.goldEarned > e.gold
+ text += " (#{e.goldEarned})"
+ goldEl.text text
+ @updateTitle()
+
+ updateTitle: ->
+ @$el.attr 'title', ("Team '#{team}' has #{gold} now of #{@teamGoldEarned[team]} gold earned." for team, gold of @teamGold).join ' '
onSetLetterbox: (e) ->
@$el.toggle not e.on
diff --git a/app/views/play/level/hud_view.coffee b/app/views/play/level/hud_view.coffee
index 581a5fb2f..87625d631 100644
--- a/app/views/play/level/hud_view.coffee
+++ b/app/views/play/level/hud_view.coffee
@@ -109,19 +109,29 @@ module.exports = class HUDView extends View
@update()
createAvatar: (thangType, thang, colorConfig) ->
+ unless thangType.isFullyLoaded()
+ args = arguments
+ unless @listeningToCreateAvatar
+ @listenToOnce thangType, 'sync', -> @createAvatar(args...)
+ @listeningToCreateAvatar = true
+ return
+ @listeningToCreateAvatar = false
options = thang.getSpriteOptions() or {}
options.async = false
options.colorConfig = colorConfig if colorConfig
- stage = thangType.getPortraitStage options
wrapper = @$el.find '.thang-canvas-wrapper'
- newCanvas = $(stage.canvas).addClass('thang-canvas')
- wrapper.empty().append(newCanvas)
team = @thang?.team or @speakerSprite?.thang?.team
wrapper.removeClass (i, css) -> (css.match(/\bteam-\S+/g) or []).join ' '
wrapper.addClass "team-#{team}"
- stage.update()
- @stage?.stopTalking()
- @stage = stage
+ if thangType.get('raster')
+ wrapper.empty().append($('![]()
').attr('src', '/file/'+thangType.get('raster')))
+ else
+ stage = thangType.getPortraitStage options
+ newCanvas = $(stage.canvas).addClass('thang-canvas')
+ wrapper.empty().append(newCanvas)
+ stage.update()
+ @stage?.stopTalking()
+ @stage = stage
onThangBeganTalking: (e) ->
return unless @stage and @thang is e.thang
@@ -160,6 +170,8 @@ module.exports = class HUDView extends View
setMessage: (message, mood, responses) ->
message = marked message
+ # Fix old HTML icons like in the Markdown
+ message = message.replace /<i class='(.+?)'><\/i>/, ""
clearInterval(@messageInterval) if @messageInterval
@bubble = $('.dialogue-bubble', @$el)
@bubble.removeClass(@lastMood) if @lastMood
@@ -249,7 +261,7 @@ module.exports = class HUDView extends View
return null # included in the bar
context =
prop: prop
- hasIcon: prop in ["health", "pos", "target", "inventory", "gold", "visualRange", "attackDamage", "attackRange", "maxSpeed"]
+ hasIcon: prop in ["health", "pos", "target", "inventory", "gold", "bountyGold", "visualRange", "attackDamage", "attackRange", "maxSpeed"]
hasBar: prop in ["health"]
$(prop_template(context))
@@ -306,10 +318,11 @@ module.exports = class HUDView extends View
for actionName, action of @thang.actions
@updateActionElement(actionName, @timespans[actionName], @thang.action is actionName)
tableContainer = @$el.find('.table-container')
- timelineWidth = tableContainer.find('tr:not(.secret) .action-timeline').width()
- right = (1 - (@timeProgress ? 0)) * timelineWidth
arrow = tableContainer.find('.progress-arrow')
- arrow.css 'right', right - arrow.width() / 2
+ @timelineWidth ||= tableContainer.find('tr:not(.secret) .action-timeline').width()
+ @actionArrowWidth ||= arrow.width()
+ right = (1 - (@timeProgress ? 0)) * @timelineWidth
+ arrow.css 'right', right - @actionArrowWidth / 2
tableContainer.find('.progress-line').css 'right', right
buildActionTimespans: ->
diff --git a/app/views/play/level/level_loading_view.coffee b/app/views/play/level/level_loading_view.coffee
index 32da3377e..217b4bc9b 100644
--- a/app/views/play/level/level_loading_view.coffee
+++ b/app/views/play/level/level_loading_view.coffee
@@ -6,9 +6,7 @@ module.exports = class LevelLoadingView extends View
id: "level-loading-view"
template: template
- subscriptions:
- 'level-loader:progress-changed': 'onLevelLoaderProgressChanged'
-
+ onLoaded: ->
afterRender: ->
@$el.find('.tip.rare').remove() if _.random(1, 10) < 9
tips = @$el.find('.tip').addClass('to-remove')
@@ -16,24 +14,19 @@ module.exports = class LevelLoadingView extends View
$(tip).removeClass('to-remove')
@$el.find('.to-remove').remove()
- onLevelLoaderProgressChanged: (e) ->
- @progress = e.progress
- @progress = 0.01 if @progress < 0.01
- @updateProgressBar()
-
- updateProgressBar: ->
- @$el.find('.progress-bar').css('width', (100 * @progress) + '%')
-
showReady: ->
+ return if @shownReady
+ @shownReady = true
ready = $.i18n.t('play_level.loading_ready', defaultValue: 'Ready!')
@$el.find('#tip-wrapper .tip').addClass('ready').text ready
- Backbone.Mediator.publish 'play-sound', trigger: 'loading_ready', volume: 0.75
+ Backbone.Mediator.publish 'play-sound', trigger: 'level_loaded', volume: 0.75 # old: loading_ready
unveil: ->
_.delay @reallyUnveil, 1000
reallyUnveil: =>
return if @destroyed
+ @$el.addClass 'unveiled'
loadingDetails = @$el.find('.loading-details')
duration = parseFloat loadingDetails.css 'transition-duration'
loadingDetails.css 'top', -loadingDetails.outerHeight(true)
@@ -43,4 +36,4 @@ module.exports = class LevelLoadingView extends View
onUnveilEnded: =>
return if @destroyed
- Backbone.Mediator.publish 'onLoadingViewUnveiled', view: @
+ Backbone.Mediator.publish 'level:loading-view-unveiled', view: @
diff --git a/app/views/play/level/modal/docs_modal.coffee b/app/views/play/level/modal/docs_modal.coffee
index 88336fb64..8c6a56a16 100644
--- a/app/views/play/level/modal/docs_modal.coffee
+++ b/app/views/play/level/modal/docs_modal.coffee
@@ -13,6 +13,7 @@ module.exports = class DocsModal extends View
'enter': 'hide'
constructor: (options) ->
+ @firstOnly = options.firstOnly
@docs = options?.docs
general = @docs.generalArticles or []
specific = @docs.specificArticles or []
@@ -24,8 +25,8 @@ module.exports = class DocsModal extends View
general = (article.attributes for article in general when article)
@docs = specific.concat(general)
- marked.setOptions {gfm: true, sanitize: false, smartLists: true, breaks: false}
@docs = $.extend(true, [], @docs)
+ @docs = [@docs[0]] if @firstOnly and @docs[0]
doc.html = marked(utils.i18n doc, 'body') for doc in @docs
doc.name = (utils.i18n doc, 'name') for doc in @docs
doc.slug = _.string.slugify(doc.name) for doc in @docs
@@ -48,6 +49,10 @@ module.exports = class DocsModal extends View
clickTab: (e) =>
@$el.find('li.active').removeClass('active')
+
+ afterInsert: ->
+ super()
+ Backbone.Mediator.publish 'level:docs-shown'
onHidden: ->
Backbone.Mediator.publish 'level:docs-hidden'
diff --git a/app/views/play/level/modal/editor_config_modal.coffee b/app/views/play/level/modal/editor_config_modal.coffee
index 6be98b44d..5047be476 100644
--- a/app/views/play/level/modal/editor_config_modal.coffee
+++ b/app/views/play/level/modal/editor_config_modal.coffee
@@ -23,11 +23,20 @@ module.exports = class EditorConfigModal extends View
constructor: (options) ->
super(options)
+ @session = options.session
getRenderData: ->
@aceConfig = _.cloneDeep me.get('aceConfig') ? {}
@aceConfig = _.defaults @aceConfig, @defaultConfig
c = super()
+ c.languages = [
+ {id: 'javascript', name: 'JavaScript'}
+ {id: 'coffeescript', name: 'CoffeeScript'}
+ {id: 'python', name: 'Python (Experimental)'}
+ {id: 'clojure', name: 'Clojure (Experimental)'}
+ {id: 'lua', name: 'Lua (Experimental)'}
+ ]
+ c.sessionLanguage = @session.get('codeLanguage') ? @aceConfig.language
c.language = @aceConfig.language
c.keyBindings = @aceConfig.keyBindings
c.invisibles = @aceConfig.invisibles
@@ -35,6 +44,9 @@ module.exports = class EditorConfigModal extends View
c.behaviors = @aceConfig.behaviors
c
+ updateSessionLanguage: ->
+ @session.set 'codeLanguage', @$el.find('#tome-session-language').val()
+
updateLanguage: ->
@aceConfig.language = @$el.find('#tome-language').val()
@@ -54,7 +66,9 @@ module.exports = class EditorConfigModal extends View
super()
onHidden: ->
- oldLanguage = @aceConfig.language
+ oldLanguage = @session.get('codeLanguage') ? @aceConfig.language
+ newLanguage = @$el.find('#tome-session-language').val()
+ @session.set 'codeLanguage', newLanguage
@aceConfig.language = @$el.find('#tome-language').val()
@aceConfig.invisibles = @$el.find('#tome-invisibles').prop('checked')
@aceConfig.keyBindings = @$el.find('#tome-key-bindings').val()
@@ -62,7 +76,8 @@ module.exports = class EditorConfigModal extends View
@aceConfig.behaviors = @$el.find('#tome-behaviors').prop('checked')
me.set 'aceConfig', @aceConfig
Backbone.Mediator.publish 'tome:change-config'
- Backbone.Mediator.publish 'tome:change-language' unless @aceConfig.language isnt oldLanguage
+ Backbone.Mediator.publish 'tome:change-language', language: newLanguage unless newLanguage is oldLanguage
+ @session.save() unless newLanguage is oldLanguage
me.save()
destroy: ->
diff --git a/app/views/play/level/modal/infinite_loop_modal.coffee b/app/views/play/level/modal/infinite_loop_modal.coffee
index f26185103..ff89e229f 100644
--- a/app/views/play/level/modal/infinite_loop_modal.coffee
+++ b/app/views/play/level/modal/infinite_loop_modal.coffee
@@ -8,3 +8,4 @@ module.exports = class InfiniteLoopModal extends View
events:
'click #restart-level-infinite-loop-retry-button': -> Backbone.Mediator.publish 'tome:cast-spell'
'click #restart-level-infinite-loop-confirm-button': -> Backbone.Mediator.publish 'restart-level'
+ 'click #restart-level-infinite-loop-comment-button': -> Backbone.Mediator.publish 'tome:comment-my-code'
diff --git a/app/views/play/level/modal/keyboard_shortcuts_modal.coffee b/app/views/play/level/modal/keyboard_shortcuts_modal.coffee
new file mode 100644
index 000000000..816bd3f10
--- /dev/null
+++ b/app/views/play/level/modal/keyboard_shortcuts_modal.coffee
@@ -0,0 +1,17 @@
+View = require 'views/kinds/ModalView'
+template = require 'templates/play/level/modal/keyboard_shortcuts'
+
+module.exports = class KeyboardShortcutsModal extends View
+ id: 'keyboard-shortcuts-modal'
+ template: template
+
+ getRenderData: ->
+ c = super()
+ c.ctrl = if @isMac() then '⌘' else '^'
+ c.ctrlName = if @isMac() then 'Cmd' else 'Ctrl'
+ c.alt = if @isMac() then '⌥' else 'alt'
+ c.altName = if @isMac() then 'Opt' else 'Alt'
+ c.enter = $.i18n.t 'keyboard_shortcuts.enter'
+ c.space = $.i18n.t 'keyboard_shortcuts.space'
+ c.escapeKey = $.i18n.t 'keyboard_shortcuts.escape'
+ c
diff --git a/app/views/play/level/modal/multiplayer_modal.coffee b/app/views/play/level/modal/multiplayer_modal.coffee
index 973bc8b47..c7e02b157 100644
--- a/app/views/play/level/modal/multiplayer_modal.coffee
+++ b/app/views/play/level/modal/multiplayer_modal.coffee
@@ -1,45 +1,54 @@
View = require 'views/kinds/ModalView'
template = require 'templates/play/level/modal/multiplayer'
-{me} = require('lib/auth')
+{me} = require 'lib/auth'
+LadderSubmissionView = require 'views/play/common/ladder_submission_view'
module.exports = class MultiplayerModal extends View
id: 'level-multiplayer-modal'
template: template
+ subscriptions:
+ 'ladder:game-submitted': 'onGameSubmitted'
+
events:
'click textarea': 'onClickLink'
'change #multiplayer': 'updateLinkSection'
-
constructor: (options) ->
super(options)
@session = options.session
@level = options.level
@listenTo(@session, 'change:multiplayer', @updateLinkSection)
@playableTeams = options.playableTeams
- @ladderGame = options.ladderGame
- console.log 'ladder game is', @ladderGame
getRenderData: ->
c = super()
c.joinLink = (document.location.href.replace(/\?.*/, '').replace('#', '') +
'?session=' +
@session.id)
- c.multiplayer = @session.get('multiplayer')
+ c.multiplayer = @session.get 'multiplayer'
c.team = @session.get 'team'
- c.levelSlug = @level?.get('slug')
+ c.levelSlug = @level?.get 'slug'
c.playableTeams = @playableTeams
- c.ladderGame = @ladderGame
# For now, ladderGame will disallow multiplayer, because session code combining doesn't play nice yet.
+ if @level?.get('type') is 'ladder'
+ c.ladderGame = true
+ c.readyToRank = @session?.readyToRank()
c
afterRender: ->
super()
@updateLinkSection()
+ @ladderSubmissionView = new LadderSubmissionView session: @session, level: @level
+ @insertSubView @ladderSubmissionView, @$el.find('.ladder-submission-view')
onClickLink: (e) ->
e.target.select()
+ onGameSubmitted: (e) ->
+ ladderURL = "/play/ladder/#{@level.get('slug')}#my-matches"
+ Backbone.Mediator.publish 'router:navigate', route: ladderURL
+
updateLinkSection: ->
multiplayer = @$el.find('#multiplayer').prop('checked')
la = @$el.find('#link-area')
diff --git a/app/views/play/level/modal/victory_modal.coffee b/app/views/play/level/modal/victory_modal.coffee
index 3fe539b99..ecc883426 100644
--- a/app/views/play/level/modal/victory_modal.coffee
+++ b/app/views/play/level/modal/victory_modal.coffee
@@ -1,6 +1,7 @@
View = require 'views/kinds/ModalView'
template = require 'templates/play/level/modal/victory'
{me} = require 'lib/auth'
+LadderSubmissionView = require 'views/play/common/ladder_submission_view'
LevelFeedback = require 'models/LevelFeedback'
utils = require 'lib/utils'
@@ -8,9 +9,11 @@ module.exports = class VictoryModal extends View
id: 'level-victory-modal'
template: template
+ subscriptions:
+ 'ladder:game-submitted': 'onGameSubmitted'
+
events:
'click .next-level-button': 'onPlayNextLevel'
- 'click .rank-game-button': 'onRankGame'
# review events
'mouseover .rating i': (e) -> @showStars(@starNum($(e.target)))
@@ -58,21 +61,9 @@ module.exports = class VictoryModal extends View
@saveReview() if @$el.find('.review textarea').val()
Backbone.Mediator.publish('play-next-level')
- onRankGame: (e) ->
- button = @$el.find('.rank-game-button')
- button.text($.i18n.t('play_level.victory_ranking_game', defaultValue: 'Submitting...'))
- button.prop 'disabled', true
- ajaxData = session: @session.id, levelID: @level.id, originalLevelID: @level.get('original'), levelMajorVersion: @level.get('version').major
+ onGameSubmitted: (e) ->
ladderURL = "/play/ladder/#{@level.get('slug')}#my-matches"
- goToLadder = -> Backbone.Mediator.publish 'router:navigate', route: ladderURL
- console.log "Posting game for ranking from victory modal."
- $.ajax '/queue/scoring',
- type: 'POST'
- data: ajaxData
- success: goToLadder
- failure: (response) ->
- console.error "Couldn't submit game for ranking:", response
- goToLadder()
+ Backbone.Mediator.publish 'router:navigate', route: ladderURL
getRenderData: ->
c = super()
@@ -82,9 +73,7 @@ module.exports = class VictoryModal extends View
c.levelName = utils.i18n @level.attributes, 'name'
c.level = @level
if c.level.get('type') is 'ladder'
- c1 = @session?.get('code')
- c2 = @session?.get('submittedCode')
- c.readyToRank = @session.get('levelID') and c1 and not _.isEqual(c1, c2)
+ c.readyToRank = @session.readyToRank()
if me.get 'hourOfCode'
# Show the Hour of Code "I'm Done" tracking pixel after they played for 30 minutes
elapsed = (new Date() - new Date(me.get('dateCreated')))
@@ -101,6 +90,8 @@ module.exports = class VictoryModal extends View
afterRender: ->
super()
+ @ladderSubmissionView = new LadderSubmissionView session: @session, level: @level
+ @insertSubView @ladderSubmissionView, @$el.find('.ladder-submission-view')
afterInsert: ->
super()
diff --git a/app/views/play/level/playback_view.coffee b/app/views/play/level/playback_view.coffee
index 4a3e4d359..8bc581e1e 100644
--- a/app/views/play/level/playback_view.coffee
+++ b/app/views/play/level/playback_view.coffee
@@ -3,6 +3,7 @@ template = require 'templates/play/level/playback'
{me} = require 'lib/auth'
EditorConfigModal = require './modal/editor_config_modal'
+KeyboardShortcutsModal = require './modal/keyboard_shortcuts_modal'
module.exports = class PlaybackView extends View
id: "playback-view"
@@ -29,6 +30,7 @@ module.exports = class PlaybackView extends View
'click #grid-toggle': 'onToggleGrid'
'click #edit-wizard-settings': 'onEditWizardSettings'
'click #edit-editor-config': 'onEditEditorConfig'
+ 'click #view-keyboard-shortcuts': 'onViewKeyboardShortcuts'
'click #music-button': 'onToggleMusic'
'click #zoom-in-button': -> Backbone.Mediator.publish('camera-zoom-in') unless @shouldIgnore()
'click #zoom-out-button': -> Backbone.Mediator.publish('camera-zoom-out') unless @shouldIgnore()
@@ -107,9 +109,12 @@ module.exports = class PlaybackView extends View
@hookUpScrubber()
@updateMusicButton()
$(window).on('resize', @onWindowResize)
+ ua = navigator.userAgent.toLowerCase()
+ if /safari/.test(ua) and not /chrome/.test(ua)
+ @$el.find('.toggle-fullscreen').hide()
updatePopupContent: ->
- @timePopup.updateContent "#{@timeToString @newTime}
#{@formatTime(@current, @currentTime)}
#{@formatTime(@total, @totalTime)}"
+ @timePopup?.updateContent "#{@timeToString @newTime}
#{@formatTime(@current, @currentTime)}
#{@formatTime(@total, @totalTime)}"
# These functions could go to some helper class
@@ -151,18 +156,16 @@ module.exports = class PlaybackView extends View
@newTime = 0
@currentTime = 0
- @timePopup = new HoverPopup unless @timePopup?
+ @timePopup ?= new HoverPopup
-
- #TODO: Why do we need defaultValues here at all? Fallback language has been set to 'en'... oO
t = $.i18n.t
- @second = t 'units.second', defaultValue: 'second'
- @seconds = t 'units.seconds', defaultValue: 'seconds'
- @minute = t 'units.minute', defaultValue: 'minute'
- @minutes = t 'units.minutes', defaultValue: 'minutes'
- @goto = t 'play_level.time_goto', defaultValue: "Go to:"
- @current = t 'play_level.time_current', defaultValue: "Now:"
- @total = t 'play_level.time_total', defaultValue: "Max:"
+ @second = t 'units.second'
+ @seconds = t 'units.seconds'
+ @minute = t 'units.minute'
+ @minutes = t 'units.minutes'
+ @goto = t 'play_level.time_goto'
+ @current = t 'play_level.time_current'
+ @total = t 'play_level.time_total'
onToggleDebug: ->
return if @shouldIgnore()
@@ -178,9 +181,13 @@ module.exports = class PlaybackView extends View
Backbone.Mediator.publish 'edit-wizard-settings'
onEditEditorConfig: ->
- @openModalView(new EditorConfigModal())
+ @openModalView new EditorConfigModal session: @options.session
- onCastSpells: ->
+ onViewKeyboardShortcuts: ->
+ @openModalView new KeyboardShortcutsModal()
+
+ onCastSpells: (e) ->
+ return if e.preload
@casting = true
@$progressScrubber.slider('disable', true)
@@ -190,9 +197,9 @@ module.exports = class PlaybackView extends View
$('button', @$el).addClass('disabled')
try
@$progressScrubber.slider('disable', true)
- catch e
- #console.warn('error disabling scrubber')
- @timePopup.disable()
+ catch error
+ console.warn('error disabling scrubber', error)
+ @timePopup?.disable()
$('#volume-button', @$el).removeClass('disabled')
onEnableControls: (e) ->
@@ -201,9 +208,9 @@ module.exports = class PlaybackView extends View
$('button', @$el).removeClass('disabled')
try
@$progressScrubber.slider('enable', true)
- catch e
- #console.warn('error enabling scrubber')
- @timePopup.enable()
+ catch error
+ console.warn('error enabling scrubber', error)
+ @timePopup?.enable()
onSetPlaying: (e) ->
@playing = (e ? {}).playing ? true
@@ -235,36 +242,36 @@ module.exports = class PlaybackView extends View
@currentTime = e.frame / e.world.frameRate
# Game will sometimes stop at 29.97, but with only one digit, this is unnecesary.
# @currentTime = @totalTime if Math.abs(@totalTime - @currentTime) < 0.04
- @updatePopupContent()
+ @updatePopupContent() if @timePopup?.shown
@updateProgress(e.progress)
@updatePlayButton(e.progress)
@lastProgress = e.progress
onProgressEnter: (e) ->
- #Why it needs itself as parameter you ask? Ask Twitter instead..
- @timePopup.enter @timePopup
+ # Why it needs itself as parameter you ask? Ask Twitter instead.
+ @timePopup?.enter @timePopup
onProgressLeave: (e) ->
- @timePopup.leave @timePopup
+ @timePopup?.leave @timePopup
onProgressHover: (e) ->
timeRatio = @$progressScrubber.width() / @totalTime
@newTime = e.offsetX / timeRatio
@updatePopupContent()
- @timePopup.onHover e
+ @timePopup?.onHover e
- #Show it instantaniously if close enough to current time.
- if Math.abs(@currentTime - @newTime) < 1 and not @timePopup.shown
- @timePopup.show() unless @timePopup.shown
+ # Show it instantaneously if close enough to current time.
+ if @timePopup and Math.abs(@currentTime - @newTime) < 1 and not @timePopup.shown
+ @timePopup.show()
updateProgress: (progress) ->
$('.scrubber .progress-bar', @$el).css('width', "#{progress*100}%")
updatePlayButton: (progress) ->
- if progress >= 1.0 and @lastProgress < 1.0
+ if progress >= 0.99 and @lastProgress < 0.99
$('#play-button').removeClass('playing').removeClass('paused').addClass('ended')
- if progress < 1.0 and @lastProgress >= 1.0
+ if progress < 0.99 and @lastProgress >= 0.99
b = $('#play-button').removeClass('ended')
if @playing then b.addClass('playing') else b.addClass('paused')
diff --git a/app/views/play/level/thang_avatar_view.coffee b/app/views/play/level/thang_avatar_view.coffee
index 3c22fc5cb..fe9babf5b 100644
--- a/app/views/play/level/thang_avatar_view.coffee
+++ b/app/views/play/level/thang_avatar_view.coffee
@@ -14,16 +14,31 @@ module.exports = class ThangAvatarView extends View
super options
@thang = options.thang
@includeName = options.includeName
+ @thangType = @getSpriteThangType()
+ if not @thangType
+ console.error 'Thang avatar view expected a thang type to be provided.'
+ return
+
+ unless @thangType.isFullyLoaded() or @thangType.loading
+ @thangType.fetch()
+
+ # couldn't get the level view to load properly through the supermodel
+ # so just doing it manually this time.
+ @listenTo @thangType, 'sync', @render
+ @listenTo @thangType, 'build-complete', @render
+
+ getSpriteThangType: ->
+ thangs = @supermodel.getModels(ThangType)
+ thangs = (t for t in thangs when t.get('name') is @thang.spriteName)
+ loadedThangs = (t for t in thangs when t.isFullyLoaded())
+ return loadedThangs[0] or thangs[0] # try to return one with all the goods, otherwise a projection
getRenderData: (context={}) ->
context = super context
context.thang = @thang
- thangs = @supermodel.getModels(ThangType)
- thangs = (t for t in thangs when t.get('name') is @thang.spriteName)
- thang = thangs[0]
options = @thang?.getSpriteOptions() or {}
- options.async = false
- context.avatarURL = thang.getPortraitSource(options)
+ options.async = true
+ context.avatarURL = @thangType.getPortraitSource(options) unless @thangType.loading
context.includeName = @includeName
context
diff --git a/app/views/play/level/tome/cast_button_view.coffee b/app/views/play/level/tome/cast_button_view.coffee
index 5b2f0e094..133cfbfcc 100644
--- a/app/views/play/level/tome/cast_button_view.coffee
+++ b/app/views/play/level/tome/cast_button_view.coffee
@@ -20,7 +20,6 @@ module.exports = class CastButtonView extends View
super options
@spells = options.spells
@levelID = options.levelID
- isMac = navigator.platform.toUpperCase().indexOf('MAC') isnt -1
@castShortcut = "⇧↵"
@castShortcutVerbose = "Shift+Enter"
@@ -36,7 +35,7 @@ module.exports = class CastButtonView extends View
@castOptions = $('.autocast-delays', @$el)
delay = me.get('autocastDelay')
delay ?= 5000
- if @levelID in ['brawlwood', 'brawlwood-tutorial', 'dungeon-arena', 'dungeon-arena-tutorial']
+ if @levelID in ['brawlwood', 'brawlwood-tutorial', 'dungeon-arena', 'dungeon-arena-tutorial', 'gold-rush', 'greed']
delay = 90019001
@setAutocastDelay delay
@@ -47,7 +46,6 @@ module.exports = class CastButtonView extends View
Backbone.Mediator.publish 'tome:manual-cast', {}
onCastOptionsClick: (e) =>
- console.log 'cast options click', $(e.target)
Backbone.Mediator.publish 'focus-editor'
@castButtonGroup.removeClass 'open'
@setAutocastDelay $(e.target).attr 'data-delay'
@@ -57,8 +55,11 @@ module.exports = class CastButtonView extends View
@updateCastButton()
onCastSpells: (e) ->
+ return if e.preload
@casting = true
- Backbone.Mediator.publish 'play-sound', trigger: 'cast', volume: 0.5
+ if @hasStartedCastingOnce # Don't play this sound the first time
+ Backbone.Mediator.publish 'play-sound', trigger: 'cast', volume: 0.5
+ @hasStartedCastingOnce = true
@updateCastButton()
@onWorldLoadProgressChanged progress: 0
@@ -69,21 +70,27 @@ module.exports = class CastButtonView extends View
onNewWorld: (e) ->
@casting = false
- Backbone.Mediator.publish 'play-sound', trigger: 'cast-end', volume: 0.5
+ if @hasCastOnce # Don't play this sound the first time
+ Backbone.Mediator.publish 'play-sound', trigger: 'cast-end', volume: 0.5
+ @hasCastOnce = true
@updateCastButton()
updateCastButton: ->
return if _.some @spells, (spell) => not spell.loaded
- castable = _.some @spells, (spell) => spell.hasChangedSignificantly spell.getSource()
- @castButtonGroup.toggleClass('castable', castable).toggleClass('casting', @casting)
- if @casting
- s = $.i18n.t("play_level.tome_cast_button_casting", defaultValue: "Casting")
- else if castable
- s = $.i18n.t("play_level.tome_cast_button_castable", defaultValue: "Cast Spell") + " " + @castShortcut
- else
- s = $.i18n.t("play_level.tome_cast_button_cast", defaultValue: "Spell Cast")
- @castButton.text s
- @castButton.prop 'disabled', not castable
+
+ async.some _.values(@spells), (spell, callback) =>
+ spell.hasChangedSignificantly spell.getSource(), null, callback
+ , (castable) =>
+ Backbone.Mediator.publish 'tome:spell-has-changed-significantly-calculation', hasChangedSignificantly: castable
+ @castButtonGroup.toggleClass('castable', castable).toggleClass('casting', @casting)
+ if @casting
+ s = $.i18n.t("play_level.tome_cast_button_casting", defaultValue: "Casting")
+ else if castable
+ s = $.i18n.t("play_level.tome_cast_button_castable", defaultValue: "Cast Spell") + " " + @castShortcut
+ else
+ s = $.i18n.t("play_level.tome_cast_button_cast", defaultValue: "Spell Cast")
+ @castButton.text s
+ @castButton.prop 'disabled', not castable
setAutocastDelay: (delay) ->
#console.log "Set autocast delay to", delay
diff --git a/app/views/play/level/tome/problem.coffee b/app/views/play/level/tome/problem.coffee
index 2e1267785..9dc6db442 100644
--- a/app/views/play/level/tome/problem.coffee
+++ b/app/views/play/level/tome/problem.coffee
@@ -17,9 +17,9 @@ module.exports = class Problem
@removeMarkerRange()
buildAnnotation: ->
- return unless @aetherProblem.ranges
+ return unless @aetherProblem.range
text = @aetherProblem.message.replace /^Line \d+: /, ''
- start = @aetherProblem.ranges[0][0]
+ start = @aetherProblem.range[0]
@annotation =
row: start.row,
column: start.col,
@@ -33,8 +33,8 @@ module.exports = class Problem
$(@ace.container).append @alertView.el
buildMarkerRange: ->
- return unless @aetherProblem.ranges
- [start, end] = @aetherProblem.ranges[0]
+ return unless @aetherProblem.range
+ [start, end] = @aetherProblem.range
clazz = "problem-marker-#{@aetherProblem.level}"
@markerRange = new Range start.row, start.col, end.row, end.col
@markerRange.start = @ace.getSession().getDocument().createAnchor @markerRange.start
diff --git a/app/views/play/level/tome/problem_alert_view.coffee b/app/views/play/level/tome/problem_alert_view.coffee
index 2d77ac523..6ab41327d 100644
--- a/app/views/play/level/tome/problem_alert_view.coffee
+++ b/app/views/play/level/tome/problem_alert_view.coffee
@@ -17,8 +17,15 @@ module.exports = class ProblemAlertView extends View
getRenderData: (context={}) ->
context = super context
- format = (s) -> s?.replace("\n", "
").replace('<', '<').replace('>', '>')
- context.message = format @problem.aetherProblem.message
+ format = (s) -> s?.replace(//g, '>').replace(/\n/g, '
')
+ message = @problem.aetherProblem.message
+ age = @problem.aetherProblem.userInfo.age
+ if age?
+ if /^Line \d+:/.test message
+ message = message.replace /^(Line \d+)/, "$1, time #{age.toFixed(1)}"
+ else
+ message = "Time #{age.toFixed(1)}: #{message}"
+ context.message = format message
context.hint = format @problem.aetherProblem.hint
context
diff --git a/app/views/play/level/tome/spell.coffee b/app/views/play/level/tome/spell.coffee
index a0cb680cb..0608c90f2 100644
--- a/app/views/play/level/tome/spell.coffee
+++ b/app/views/play/level/tome/spell.coffee
@@ -2,6 +2,9 @@ SpellView = require './spell_view'
SpellListTabEntryView = require './spell_list_tab_entry_view'
{me} = require 'lib/auth'
+Aether.addGlobal 'Vector', require 'lib/world/vector'
+Aether.addGlobal '_', _
+
module.exports = class Spell
loaded: false
view: null
@@ -11,26 +14,31 @@ module.exports = class Spell
@spellKey = options.spellKey
@pathComponents = options.pathComponents
@session = options.session
+ @spectateView = options.spectateView
@supermodel = options.supermodel
- @skipFlow = options.skipFlow
@skipProtectAPI = options.skipProtectAPI
@worker = options.worker
p = options.programmableMethod
@name = p.name
- @source = @session.getSourceFor(@spellKey) ? p.source
- @originalSource = p.source
- @parameters = p.parameters
@permissions = read: p.permissions?.read ? [], readwrite: p.permissions?.readwrite ? [] # teams
+ teamSpells = @session.get('teamSpells')
+ team = @session.get('team') ? 'humans'
+ @useTranspiledCode = @permissions.readwrite.length and ((teamSpells and not _.contains(teamSpells[team], @spellKey)) or (@session.get('creator') isnt me.id) or @spectateView)
+ #console.log @spellKey, "using transpiled code?", @useTranspiledCode
+ @source = @originalSource = p.source
+ @parameters = p.parameters
+ if @permissions.readwrite.length and sessionSource = @session.getSourceFor(@spellKey)
+ @source = sessionSource
+ @language = if @canWrite() then options.language else 'javascript'
@thangs = {}
- @view = new SpellView {spell: @, session: @session}
+ @view = new SpellView {spell: @, session: @session, worker: @worker}
@view.render() # Get it ready and code loaded in advance
@tabView = new SpellListTabEntryView spell: @, supermodel: @supermodel
@tabView.render()
@team = @permissions.readwrite[0] ? "common"
Backbone.Mediator.publish 'tome:spell-created', spell: @
-
destroy: ->
@view.destroy()
@tabView.destroy()
@@ -61,11 +69,16 @@ module.exports = class Spell
else
source = @getSource()
[pure, problems] = [null, null]
+ if @useTranspiledCode
+ transpiledCode = @session.get('code')
for thangID, spellThang of @thangs
unless pure
- pure = spellThang.aether.transpile source
- problems = spellThang.aether.problems
- #console.log "aether transpiled", source.length, "to", pure.length, "for", thangID, @spellKey
+ if @useTranspiledCode and transpiledSpell = transpiledCode[@spellKey.split('/')[0]]?[@name]
+ spellThang.aether.pure = transpiledSpell
+ else
+ pure = spellThang.aether.transpile source
+ problems = spellThang.aether.problems
+ #console.log "aether transpiled", source.length, "to", spellThang.aether.pure.length, "for", thangID, @spellKey
else
spellThang.aether.pure = pure
spellThang.aether.problems = problems
@@ -75,45 +88,64 @@ module.exports = class Spell
hasChanged: (newSource=null, currentSource=null) ->
(newSource ? @originalSource) isnt (currentSource ? @source)
- hasChangedSignificantly: (newSource=null, currentSource=null) ->
+ hasChangedSignificantly: (newSource=null, currentSource=null, cb) ->
for thangID, spellThang of @thangs
aether = spellThang.aether
break
unless aether
console.error @toString(), "couldn't find a spellThang with aether of", @thangs
- return false
- aether.hasChangedSignificantly (newSource ? @originalSource), (currentSource ? @source), true, true
+ cb false
+ workerMessage =
+ function: "hasChangedSignificantly"
+ a: (newSource ? @originalSource)
+ spellKey: @spellKey
+ b: (currentSource ? @source)
+ careAboutLineNumbers: true
+ careAboutLint: true
+ @worker.addEventListener "message", (e) =>
+ workerData = JSON.parse e.data
+ if workerData.function is "hasChangedSignificantly" and workerData.spellKey is @spellKey
+ @worker.removeEventListener "message", arguments.callee, false
+ cb(workerData.hasChanged)
+ @worker.postMessage JSON.stringify(workerMessage)
createAether: (thang) ->
aceConfig = me.get('aceConfig') ? {}
+ writable = @permissions.readwrite.length > 0
aetherOptions =
problems:
jshint_W040: {level: "ignore"}
jshint_W030: {level: "ignore"} # aether_NoEffect instead
- aether_MissingThis: {level: (if thang.requiresThis then 'error' else 'warning')}
- language: aceConfig.language ? 'javascript'
+ jshint_W038: {level: "ignore"} # eliminates hoisting problems
+ jshint_W091: {level: "ignore"} # eliminates more hoisting problems
+ jshint_E043: {level: "ignore"} # https://github.com/codecombat/codecombat/issues/813 -- since we can't actually tell JSHint to really ignore things
+ jshint_Unknown: {level: "ignore"} # E043 also triggers Unknown, so ignore that, too
+ aether_MissingThis: {level: 'error'}
+ language: if @canWrite() then @language else 'javascript'
functionName: @name
functionParameters: @parameters
yieldConditionally: thang.plan?
- requiresThis: thang.requiresThis
+ globals: ['Vector', '_']
# TODO: Gridmancer doesn't currently work with protectAPI, so hack it off
- protectAPI: not (@skipProtectAPI or window.currentView?.level.get('name').match("Gridmancer")) and @permissions.readwrite.length > 0 # If anyone can write to this method, we must protect it.
- includeFlow: not @skipFlow and @canRead()
- #callIndex: 0
- #timelessVariables: ['i']
- #statementIndex: 9001
- if not (me.team in @permissions.readwrite) or window.currentView?.sessionID is "52bfb88099264e565d001349" # temp fix for debugger explosion bug
- #console.log "Turning off includeFlow for", @spellKey
- aetherOptions.includeFlow = false
+ protectAPI: not (@skipProtectAPI or window.currentView?.level.get('name').match("Gridmancer")) and writable # If anyone can write to this method, we must protect it.
+ includeFlow: false
#console.log "creating aether with options", aetherOptions
aether = new Aether aetherOptions
+ workerMessage =
+ function: "createAether"
+ spellKey: @spellKey
+ options: aetherOptions
+ @worker.postMessage JSON.stringify workerMessage
aether
- updateLanguageAether: ->
- aceConfig = me.get('aceConfig') ? {}
+ updateLanguageAether: (@language) ->
for thangId, spellThang of @thangs
- spellThang.aether?.setLanguage (aceConfig.language ? 'javascript')
+ spellThang.aether?.setLanguage @language
spellThang.castAether = null
+ workerMessage =
+ function: "updateLanguageAether"
+ newLanguage: @language
+ @worker.postMessage JSON.stringify workerMessage
@transpile()
toString: ->
diff --git a/app/views/play/level/tome/spell_debug_view.coffee b/app/views/play/level/tome/spell_debug_view.coffee
index 32f7b0182..c48d3beab 100644
--- a/app/views/play/level/tome/spell_debug_view.coffee
+++ b/app/views/play/level/tome/spell_debug_view.coffee
@@ -13,6 +13,11 @@ module.exports = class DebugView extends View
subscriptions:
'god:new-world-created': 'onNewWorld'
+ 'god:debug-value-return': 'handleDebugValue'
+ 'tome:spell-shown': 'changeCurrentThangAndSpell'
+ 'tome:cast-spells': 'onTomeCast'
+ 'surface:frame-changed': 'onFrameChanged'
+ 'tome:spell-has-changed-significantly-calculation': 'onSpellChangedCalculation'
events: {}
@@ -20,11 +25,72 @@ module.exports = class DebugView extends View
super options
@ace = options.ace
@thang = options.thang
+ @spell = options.spell
@variableStates = {}
- @globals = {Math: Math, _: _} # ... add more as documented
- for className, klass of serializedClasses
- @globals[className] = klass
+ @globals = {Math: Math, _: _, String: String, Number: Number, Array: Array, Object: Object} # ... add more as documented
+ for className, serializedClass of serializedClasses
+ @globals[className] = serializedClass
+
@onMouseMove = _.throttle @onMouseMove, 25
+ @cache = {}
+ @lastFrameRequested = -1
+ @workerIsSimulating = false
+ @spellHasChanged = false
+
+
+
+ pad2: (num) ->
+ if not num? or num is 0 then "00" else ((if num < 10 then "0" else "") + num)
+
+ calculateCurrentTimeString: =>
+ time = @currentFrame / @frameRate
+ mins = Math.floor(time / 60)
+ secs = (time - mins * 60).toFixed(1)
+ "#{mins}:#{@pad2 secs}"
+
+
+ setTooltipKeyAndValue: (key, value) =>
+ message = "Time: #{@calculateCurrentTimeString()}\n#{key}: #{value}"
+ @$el.find("code").text message
+ @$el.show().css(@pos)
+
+ setTooltipText: (text) =>
+ #perhaps changing styling here in the future
+ @$el.find("code").text text
+ @$el.show().css(@pos)
+
+ onTomeCast: ->
+ @invalidateCache()
+
+ invalidateCache: -> @cache = {}
+
+ retrieveValueFromCache: (thangID,spellID,variableChain,frame) ->
+ joinedVariableChain = variableChain.join()
+ value = @cache[frame]?[thangID]?[spellID]?[joinedVariableChain]
+ return value ? undefined
+
+ updateCache: (thangID, spellID, variableChain, frame, value) ->
+ currentObject = @cache
+ keys = [frame,thangID,spellID,variableChain.join()]
+ for keyIndex in [0...(keys.length - 1)]
+ key = keys[keyIndex]
+ unless key of currentObject
+ currentObject[key] = {}
+ currentObject = currentObject[key]
+ currentObject[keys[keys.length - 1]] = value
+
+
+ changeCurrentThangAndSpell: (thangAndSpellObject) ->
+ @thang = thangAndSpellObject.thang
+ @spell = thangAndSpellObject.spell
+
+ handleDebugValue: (returnObject) ->
+ @workerIsSimulating = false
+ {key, value} = returnObject
+ @updateCache(@thang.id,@spell.name,key.split("."),@lastFrameRequested,value)
+ if @variableChain and not key is @variableChain.join(".") then return
+ @setTooltipKeyAndValue(key,value)
+
afterRender: ->
super()
@@ -33,17 +99,18 @@ module.exports = class DebugView extends View
setVariableStates: (@variableStates) ->
@update()
+ isIdentifier: (t) ->
+ t and (t.type is 'identifier' or t.value is 'this' or @globals[t.value])
+
onMouseMove: (e) =>
return if @destroyed
pos = e.getDocumentPosition()
- endOfDoc = pos.row is @ace.getSession().getDocument().getLength() - 1
it = new TokenIterator e.editor.session, pos.row, pos.column
- isIdentifier = (t) => t and (t.type is 'identifier' or t.value is 'this' or @globals[t.value])
- while it.getCurrentTokenRow() is pos.row and not isIdentifier(token = it.getCurrentToken())
+ endOfLine = it.getCurrentToken()?.index is it.$rowTokens.length - 1
+ while it.getCurrentTokenRow() is pos.row and not @isIdentifier(token = it.getCurrentToken())
+ break if endOfLine or not token # Don't iterate beyond end or beginning of line
it.stepBackward()
- break unless token
- break if endOfDoc # Don't iterate backward on last line, since we might be way below.
- if isIdentifier token
+ if @isIdentifier token
# This could be a property access, like "enemy.target.pos" or "this.spawnedRectangles".
# We have to realize this and dig into the nesting of the objects.
start = it.getCurrentTokenColumn()
@@ -53,11 +120,12 @@ module.exports = class DebugView extends View
break unless it.getCurrentToken()?.value is "."
it.stepBackward()
token = null # If we're doing a complex access like this.getEnemies().length, then length isn't a valid var.
- break unless isIdentifier(prev = it.getCurrentToken())
+ break unless @isIdentifier(prev = it.getCurrentToken())
token = prev
start = it.getCurrentTokenColumn()
chain.unshift token.value
- if token and (token.value of @variableStates or token.value is "this" or @globals[token.value])
+ #Highlight all tokens, so true overrides all other conditions TODO: Refactor this later
+ if token and (true or token.value of @variableStates or token.value is "this" or @globals[token.value])
@variableChain = chain
offsetX = e.domEvent.offsetX ? e.clientX - $(e.domEvent.target).offset().left
offsetY = e.domEvent.offsetY ? e.clientY - $(e.domEvent.target).offset().top
@@ -75,12 +143,35 @@ module.exports = class DebugView extends View
onNewWorld: (e) ->
@thang = @options.thang = e.world.thangMap[@thang.id] if @thang
+ @frameRate = e.world.frameRate
+ onFrameChanged: (data) ->
+ @currentFrame = data.frame
+ @frameRate = data.world.frameRate
+ onSpellChangedCalculation: (data) ->
+ @spellHasChanged = data.hasChangedSignificantly
+
update: ->
if @variableChain
- {key, value} = @deserializeVariableChain @variableChain
- @$el.find("code").text "#{key}: #{value}"
- @$el.show().css(@pos)
+ if @spellHasChanged
+ @setTooltipText("You've changed this spell! \nPlease recast to use the hover debugger.")
+ else if @variableChain.length is 2 and @variableChain[0] is "this"
+ @setTooltipKeyAndValue(@variableChain.join("."),@stringifyValue(@thang[@variableChain[1]],0))
+ else if @variableChain.length is 1 and Aether.globals[@variableChain[0]]
+ @setTooltipKeyAndValue(@variableChain.join("."),@stringifyValue(Aether.globals[@variableChain[0]],0))
+ else if @workerIsSimulating
+ @setTooltipText("World is simulating, please wait...")
+ else if @currentFrame is @lastFrameRequested and (cacheValue = @retrieveValueFromCache(@thang.id, @spell.name, @variableChain, @currentFrame))
+ @setTooltipKeyAndValue(@variableChain.join("."),cacheValue)
+ else
+ Backbone.Mediator.publish 'tome:spell-debug-value-request',
+ thangID: @thang.id
+ spellID: @spell.name
+ variableChain: @variableChain
+ frame: @currentFrame
+ if @currentFrame isnt @lastFrameRequested then @workerIsSimulating = true
+ @lastFrameRequested = @currentFrame
+ @setTooltipText("Finding value...")
else
@$el.hide()
if @variableChain?.length is 2
@@ -90,21 +181,6 @@ module.exports = class DebugView extends View
@notifyPropertyHovered()
@updateMarker()
- notifyPropertyHovered: =>
- clearTimeout @hoveredPropertyTimeout if @hoveredPropertyTimeout
- @hoveredPropertyTimeout = null
- oldHoveredProperty = @hoveredProperty
- @hoveredProperty = if @variableChain?.length is 2 then owner: @variableChain[0], property: @variableChain[1] else {}
- unless _.isEqual oldHoveredProperty, @hoveredProperty
- Backbone.Mediator.publish 'tome:spell-debug-property-hovered', @hoveredProperty
-
- updateMarker: ->
- if @marker
- @ace.getSession().removeMarker @marker
- @marker = null
- if @markerRange
- @marker = @ace.getSession().addMarker @markerRange, "ace_bracket", "text"
-
stringifyValue: (value, depth) ->
return value if not value or _.isString value
if _.isFunction value
@@ -138,27 +214,21 @@ module.exports = class DebugView extends View
prefix ?= "Object" if isObject
prefix = if prefix then prefix + " " else ""
return "#{prefix}#{brackets[0]}#{sep} #{values.join(sep + ' ')}#{sep}#{brackets[1]}"
+ notifyPropertyHovered: =>
+ clearTimeout @hoveredPropertyTimeout if @hoveredPropertyTimeout
+ @hoveredPropertyTimeout = null
+ oldHoveredProperty = @hoveredProperty
+ @hoveredProperty = if @variableChain?.length is 2 then owner: @variableChain[0], property: @variableChain[1] else {}
+ unless _.isEqual oldHoveredProperty, @hoveredProperty
+ Backbone.Mediator.publish 'tome:spell-debug-property-hovered', @hoveredProperty
+
+ updateMarker: ->
+ if @marker
+ @ace.getSession().removeMarker @marker
+ @marker = null
+ if @markerRange
+ @marker = @ace.getSession().addMarker @markerRange, "ace_bracket", "text"
- deserializeVariableChain: (chain) ->
- keys = []
- for prop, i in chain
- if prop is "this"
- value = @thang
- else if i is 0
- value = @variableStates[prop]
- if typeof value is "undefined" then value = @globals[prop]
- else
- value = value[prop]
- keys.push prop
- break unless value
- if theClass = serializedClasses[value.CN]
- if value.CN is "Thang"
- thang = @thang.world.thangMap[value.id]
- value = thang or ""
- else
- value = theClass.deserializeFromAether(value)
- value = @stringifyValue value, 0
- key: keys.join("."), value: value
destroy: ->
@ace?.removeEventListener "mousemove", @onMouseMove
diff --git a/app/views/play/level/tome/spell_palette_entry_view.coffee b/app/views/play/level/tome/spell_palette_entry_view.coffee
index ba6665931..5a610d984 100644
--- a/app/views/play/level/tome/spell_palette_entry_view.coffee
+++ b/app/views/play/level/tome/spell_palette_entry_view.coffee
@@ -6,9 +6,6 @@ filters = require 'lib/image_filter'
{downTheChain} = require 'lib/world/world_utils'
window.Vector = require 'lib/world/vector' # So we can document it
-# If we use marked somewhere else, we'll have to make sure to preserve options
-marked.setOptions {gfm: true, sanitize: false, smartLists: true, breaks: true}
-
safeJSONStringify = (input, maxDepth) ->
recursion = (input, path, depth) ->
output = {}
diff --git a/app/views/play/level/tome/spell_palette_view.coffee b/app/views/play/level/tome/spell_palette_view.coffee
index 3a1056733..e14ff1507 100644
--- a/app/views/play/level/tome/spell_palette_view.coffee
+++ b/app/views/play/level/tome/spell_palette_view.coffee
@@ -39,6 +39,7 @@ module.exports = class SpellPaletteView extends View
for entry in entryColumn
col.append entry.el
entry.render() # Render after appending so that we can access parent container for popover
+ $('.nano').nanoScroller()
createPalette: ->
lcs = @supermodel.getModels LevelComponent
@@ -50,19 +51,24 @@ module.exports = class SpellPaletteView extends View
allDocs['__' + doc.name].push doc
if doc.type is 'snippet' then doc.owner = 'snippets'
- propStorage =
- 'this': 'programmableProperties'
- more: 'moreProgrammableProperties'
- Math: 'programmableMathProperties'
- Array: 'programmableArrayProperties'
- Object: 'programmableObjectProperties'
- String: 'programmableStringProperties'
- Vector: 'programmableVectorProperties'
- snippets: 'programmableSnippets'
+ if @options.programmable
+ propStorage =
+ 'this': 'programmableProperties'
+ more: 'moreProgrammableProperties'
+ Math: 'programmableMathProperties'
+ Array: 'programmableArrayProperties'
+ Object: 'programmableObjectProperties'
+ String: 'programmableStringProperties'
+ Vector: 'programmableVectorProperties'
+ snippets: 'programmableSnippets'
+ else
+ propStorage =
+ 'this': 'apiProperties'
count = 0
propGroups = {}
for owner, storage of propStorage
- added = propGroups[owner] = _.sortBy(@thang[storage] ? []).slice()
+ props = _.reject @thang[storage] ? [], (prop) -> prop[0] is '_' # no private properties
+ added = propGroups[owner] = _.sortBy(props).slice()
count += added.length
shortenize = count > 6
@@ -77,7 +83,7 @@ module.exports = class SpellPaletteView extends View
doc ?= prop
@entries.push @addEntry(doc, shortenize, tabbify, owner is 'snippets')
groupForEntry = (entry) ->
- return 'more' if entry.doc.owner is 'this' and entry.doc.name in propGroups.more
+ return 'more' if entry.doc.owner is 'this' and entry.doc.name in (propGroups.more ? [])
entry.doc.owner
@entries = _.sortBy @entries, (entry) ->
order = ['this', 'more', 'Math', 'Vector', 'snippets']
diff --git a/app/views/play/level/tome/spell_view.coffee b/app/views/play/level/tome/spell_view.coffee
index 4951b6915..75f559bdf 100644
--- a/app/views/play/level/tome/spell_view.coffee
+++ b/app/views/play/level/tome/spell_view.coffee
@@ -18,6 +18,9 @@ module.exports = class SpellView extends View
editModes:
'javascript': 'ace/mode/javascript'
'coffeescript': 'ace/mode/coffee'
+ 'clojure': 'ace/mode/clojure'
+ 'lua': 'ace/mode/lua'
+ 'python': 'ace/mode/python'
keyBindings:
'default': null
@@ -47,10 +50,11 @@ module.exports = class SpellView extends View
constructor: (options) ->
super options
+ @worker = options.worker
@session = options.session
@listenTo(@session, 'change:multiplayer', @onMultiplayerChanged)
@spell = options.spell
- @problems = {}
+ @problems = []
@writable = false unless me.team in @spell.permissions.readwrite # TODO: make this do anything
@highlightCurrentLine = _.throttle @highlightCurrentLine, 100
@@ -63,7 +67,7 @@ module.exports = class SpellView extends View
@createFirepad()
else
# needs to happen after the code generating this view is complete
- setTimeout @onAllLoaded, 1
+ _.defer @onAllLoaded
createACE: ->
# Test themes and settings here: http://ace.ajax.org/build/kitchen-sink.html
@@ -72,7 +76,7 @@ module.exports = class SpellView extends View
@aceSession = @ace.getSession()
@aceDoc = @aceSession.getDocument()
@aceSession.setUseWorker false
- @aceSession.setMode @editModes[aceConfig.language ? 'javascript']
+ @aceSession.setMode @editModes[@spell.language]
@aceSession.setWrapLimitRange null
@aceSession.setUseWrapMode true
@aceSession.setNewLineMode "unix"
@@ -96,8 +100,12 @@ module.exports = class SpellView extends View
aceCommands.push c.name
addCommand
name: 'run-code'
- bindKey: {win: 'Shift-Enter|Ctrl-Enter|Ctrl-S', mac: 'Shift-Enter|Command-Enter|Ctrl-Enter|Command-S|Ctrl-S'}
+ bindKey: {win: 'Shift-Enter|Ctrl-Enter', mac: 'Shift-Enter|Command-Enter|Ctrl-Enter'}
exec: -> Backbone.Mediator.publish 'tome:manual-cast', {}
+ addCommand
+ name: 'no-op'
+ bindKey: {win: 'Ctrl-S', mac: 'Command-S|Ctrl-S'}
+ exec: -> # just prevent page save call
addCommand
name: 'toggle-playing'
bindKey: {win: 'Ctrl-P', mac: 'Command-P|Ctrl-P'}
@@ -106,8 +114,8 @@ module.exports = class SpellView extends View
name: 'end-current-script'
bindKey: {win: 'Shift-Space', mac: 'Shift-Space'}
passEvent: true # https://github.com/ajaxorg/ace/blob/master/lib/ace/keyboard/keybinding.js#L114
- # No easy way to selectively cancel shift+space, since we don't get access to the event.
- # Maybe we could temporarily set ourselves to read-only if we somehow know that a script is active?
+ # No easy way to selectively cancel shift+space, since we don't get access to the event.
+ # Maybe we could temporarily set ourselves to read-only if we somehow know that a script is active?
exec: -> Backbone.Mediator.publish 'level:shift-space-pressed'
addCommand
name: 'end-all-scripts'
@@ -145,6 +153,11 @@ module.exports = class SpellView extends View
name: 'spell-beautify'
bindKey: {win: 'Ctrl-Shift-B', mac: 'Command-Shift-B|Ctrl-Shift-B'}
exec: -> Backbone.Mediator.publish 'spell-beautify'
+ addCommand
+ name: 'prevent-line-jump'
+ bindKey: {win: 'Ctrl-L', mac: 'Command-L'}
+ passEvent: true
+ exec: -> # just prevent default ACE go-to-line alert
fillACE: ->
@ace.setValue @spell.source
@@ -157,7 +170,7 @@ module.exports = class SpellView extends View
@firepad?.dispose()
createFirepad: ->
- # load from firebase or the original source if there's nothing there
+ # load from firebase or the original source if there's nothing there
return if @firepadLoading
@eventsSuppressed = true
@loaded = false
@@ -188,7 +201,7 @@ module.exports = class SpellView extends View
@createToolbarView()
createDebugView: ->
- @debugView = new SpellDebugView ace: @ace, thang: @thang
+ @debugView = new SpellDebugView ace: @ace, thang: @thang, spell:@spell
@$el.append @debugView.render().$el.hide()
createToolbarView: ->
@@ -209,11 +222,11 @@ module.exports = class SpellView extends View
@createDebugView() unless @debugView
@debugView.thang = @thang
@toolbarView?.toggleFlow false
- @updateAether false, true
+ @updateAether false, false
@highlightCurrentLine()
- cast: ->
- Backbone.Mediator.publish 'tome:cast-spell', spell: @spell, thang: @thang
+ cast: (preload=false) ->
+ Backbone.Mediator.publish 'tome:cast-spell', spell: @spell, thang: @thang, preload: preload
notifySpellChanged: =>
Backbone.Mediator.publish 'tome:spell-changed', spell: @spell
@@ -278,35 +291,27 @@ module.exports = class SpellView extends View
]
@onCodeChangeMetaHandler = =>
return if @eventsSuppressed
- if not @spellThang or @spell.hasChangedSignificantly @getSource(), @spellThang.aether.raw
- callback() for callback in onSignificantChange # Do these first
- callback() for callback in onAnyChange # Then these
+ @spell.hasChangedSignificantly @getSource(), @spellThang.aether.raw, (hasChanged) =>
+ if not @spellThang or hasChanged
+ callback() for callback in onSignificantChange # Do these first
+ callback() for callback in onAnyChange # Then these
@aceDoc.on 'change', @onCodeChangeMetaHandler
- setRecompileNeeded: (needed=true) =>
- if needed
- @recompileNeeded = needed # and @recompileValid # todo, remove if not caring about validity
- else
- @recompileNeeded = false
+ setRecompileNeeded: (@recompileNeeded) =>
onCursorActivity: =>
@currentAutocastHandler?()
# Design for a simpler system?
- # * Turn off ACE's JSHint worker
# * Keep Aether linting, debounced, on any significant change
- # - Don't send runtime errors from in-progress worlds
# - All problems just vanish when you make any change to the code
# * You wouldn't accept any Aether updates/runtime information/errors unless its code was current when you got it
- # * Store the last run Aether in each spellThang and use it whenever its code actually is current
- # This suffers from the problem that any whitespace/comment changes will lose your info, but what else
- # could you do other than somehow maintain a mapping from current to original code locations?
- # I guess you could use dynamic markers for problem ranges and keep annotations/alerts in when insignificant
+ # * Store the last run Aether in each spellThang and use it whenever its code actually is current.
+ # Use dynamic markers for problem ranges and keep annotations/alerts in when insignificant
# changes happen, but always treat any change in the (trimmed) number of lines as a significant change.
- # Ooh, that's pretty nice. Gets you most of the way there and is simple.
# - All problems have a master representation as a Problem, and we can easily generate all Problems from
# any Aether instance. Then when we switch contexts in any way, we clear, recreate, and reapply the Problems.
- # * Problem alerts will have their own templated ProblemAlertViews
+ # * Problem alerts have their own templated ProblemAlertViews.
# * We'll only show the first problem alert, and it will always be at the bottom.
# Annotations and problem ranges can show all, I guess.
# * The editor will reserve space for one annotation as a codeless area.
@@ -317,20 +322,39 @@ module.exports = class SpellView extends View
# to a new spellThang, we may want to refresh our Aether display.
return unless aether = @spellThang?.aether
source = @getSource()
- codeHasChangedSignificantly = force or @spell.hasChangedSignificantly source, aether.raw
- needsUpdate = codeHasChangedSignificantly or @spellThang isnt @lastUpdatedAetherSpellThang
- return if not needsUpdate and aether is @displayedAether
- castAether = @spellThang.castAether
- codeIsAsCast = castAether and not @spell.hasChangedSignificantly source, castAether.raw
- aether = castAether if codeIsAsCast
- return if not needsUpdate and aether is @displayedAether
+ @spell.hasChangedSignificantly source, aether.raw, (hasChanged) =>
+ codeHasChangedSignificantly = force or hasChanged
+ needsUpdate = codeHasChangedSignificantly or @spellThang isnt @lastUpdatedAetherSpellThang
+ return if not needsUpdate and aether is @displayedAether
+ castAether = @spellThang.castAether
+ codeIsAsCast = castAether and source is castAether.raw
+ aether = castAether if codeIsAsCast
+ return if not needsUpdate and aether is @displayedAether
- # Now that that's figured out, perform the update.
- @clearAetherDisplay()
- aether.transpile source if codeHasChangedSignificantly and not codeIsAsCast
- @displayAether aether
- @lastUpdatedAetherSpellThang = @spellThang
- @guessWhetherFinished aether if fromCodeChange
+ # Now that that's figured out, perform the update.
+ # The web worker Aether won't track state, so don't have to worry about updating it
+ finishUpdatingAether = (aether) =>
+ @displayAether aether
+ @lastUpdatedAetherSpellThang = @spellThang
+ @guessWhetherFinished aether if fromCodeChange
+
+ @clearAetherDisplay()
+ if codeHasChangedSignificantly and not codeIsAsCast
+ workerMessage =
+ function: "transpile"
+ spellKey: @spell.spellKey
+ source: source
+
+ @worker.addEventListener "message", (e) =>
+ workerData = JSON.parse e.data
+ if workerData.function is "transpile" and workerData.spellKey is @spell.spellKey
+ @worker.removeEventListener "message", arguments.callee, false
+ aether.problems = workerData.problems
+ aether.raw = source
+ finishUpdatingAether(aether)
+ @worker.postMessage JSON.stringify(workerMessage)
+ else
+ finishUpdatingAether(aether)
clearAetherDisplay: ->
problem.destroy() for problem in @problems
@@ -341,6 +365,8 @@ module.exports = class SpellView extends View
displayAether: (aether) ->
@displayedAether = aether
isCast = not _.isEmpty(aether.metrics) or _.some aether.problems.errors, {type: 'runtime'}
+ isCast = isCast or @spell.language isnt 'javascript' # Since we don't have linting for other languages
+ problem.destroy() for problem in @problems # Just in case another problem was added since clearAetherDisplay() ran.
@problems = []
annotations = []
seenProblemKeys = {}
@@ -362,28 +388,36 @@ module.exports = class SpellView extends View
# Autocast:
# Goes immediately if the code is a) changed and b) complete/valid and c) the cursor is at beginning or end of a line
- # We originall thought it would:
+ # We originally thought it would:
# - Go after specified delay if a) and b) but not c)
# - Go only when manually cast or deselecting a Thang when there are errors
# But the error message display was delayed, so now trying:
# - Go after specified delay if a) and not b) or c)
guessWhetherFinished: (aether) ->
- return if @autocastDelay > 60000
- #@recompileValid = not aether.getAllProblems().length
valid = not aether.getAllProblems().length
cursorPosition = @ace.getCursorPosition()
currentLine = _.string.rtrim(@aceDoc.$lines[cursorPosition.row].replace(/[ \t]*\/\/[^"']*/g, '')) # trim // unless inside "
endOfLine = cursorPosition.column >= currentLine.length # just typed a semicolon or brace, for example
beginningOfLine = not currentLine.substr(0, cursorPosition.column).trim().length # uncommenting code, for example
#console.log "finished?", valid, endOfLine, beginningOfLine, cursorPosition, currentLine.length, aether, new Date() - 0, currentLine
- if valid and endOfLine or beginningOfLine
- @recompile()
- #console.log "recompile now!"
- #else if not valid
- # # if this works, we can get rid of all @recompileValid logic
- # console.log "not valid, but so we'll wait to do it in", @autocastDelay + "ms"
- #else
- # console.log "valid but not at end of line; recompile in", @autocastDelay + "ms"
+ if valid and (endOfLine or beginningOfLine)
+ if @autocastDelay > 60000
+ @preload()
+ else
+ @recompile()
+
+ preload: ->
+ # Send this code over to the God for preloading, but don't change the cast state.
+ oldSource = @spell.source
+ oldSpellThangAethers = {}
+ for thangID, spellThang of @spell.thangs
+ oldSpellThangAethers[thangID] = spellThang.aether.serialize() # Get raw, pure, and problems
+ @spell.transpile @getSource()
+ @cast true
+ @spell.source = oldSource
+ for thangID, spellThang of @spell.thangs
+ for key, value of oldSpellThangAethers[thangID]
+ spellThang.aether[key] = value
onSpellChanged: (e) ->
@spellHasChanged = true
@@ -400,10 +434,11 @@ module.exports = class SpellView extends View
return @onInfiniteLoop e if e.problem.id is "runtime_InfiniteLoop"
return unless e.problem.userInfo.methodName is @spell.name
return unless spellThang = _.find @spell.thangs, (spellThang, thangID) -> thangID is e.problem.userInfo.thangID
- return if @spell.hasChangedSignificantly @getSource() # don't show this error if we've since edited the code
- spellThang.aether.addProblem e.problem
- @lastUpdatedAetherSpellThang = null # force a refresh without a re-transpile
- @updateAether false, false
+ @spell.hasChangedSignificantly @getSource(), null, (hasChanged) =>
+ return if hasChanged
+ spellThang.aether.addProblem e.problem
+ @lastUpdatedAetherSpellThang = null # force a refresh without a re-transpile
+ @updateAether false, false
onInfiniteLoop: (e) ->
return unless @spellThang
@@ -418,7 +453,7 @@ module.exports = class SpellView extends View
aether = e.world.userCodeMap[thangID]?[@spell.name] # Might not be there if this is a new Programmable Thang.
spellThang.castAether = aether
spellThang.aether = @spell.createAether thang
- #console.log thangID, @spell.spellKey, "ran", aether.metrics.callsExecuted, "times over", aether.metrics.statementsExecuted, "statements, with max recursion depth", aether.metrics.maxDepth, "and full flow/metrics", aether.metrics, aether.flow
+ #console.log thangID, @spell.spellKey, "ran", aether.metrics.callsExecuted, "times over", aether.metrics.statementsExecuted, "statements, with max recursion depth", aether.metrics.maxDepth, "and full flow/metrics", aether.metrics, aether.flow
@spell.transpile()
@updateAether false, false
@@ -438,7 +473,7 @@ module.exports = class SpellView extends View
@highlightCurrentLine()
onCoordinateSelected: (e) ->
- return unless e.x? and e.y?
+ return unless @ace.isFocused() and e.x? and e.y?
@ace.insert "{x: #{e.x}, y: #{e.y}}"
@highlightCurrentLine()
@@ -469,7 +504,7 @@ module.exports = class SpellView extends View
break
_.last(executed).push state
executedRows[state.range[0].row] = true
- #state.executing = true if state.userInfo?.time is @thang.world.age # no work
+ #state.executing = true if state.userInfo?.time is @thang.world.age # no work
currentCallIndex ?= callNumber - 1
#console.log "got call index", currentCallIndex, "for time", @thang.world.age, "out of", states.length
@@ -571,14 +606,14 @@ module.exports = class SpellView extends View
@ace.setDisplayIndentGuides aceConfig.indentGuides # default false
@ace.setShowInvisibles aceConfig.invisibles # default false
@ace.setKeyboardHandler @keyBindings[aceConfig.keyBindings ? 'default']
- # @aceSession.setMode @editModes[aceConfig.language ? 'javascript']
onChangeLanguage: (e) ->
- aceConfig = me.get('aceConfig') ? {}
- @aceSession.setMode @editModes[aceConfig.language ? 'javascript']
+ if @spell.canWrite()
+ @aceSession.setMode @editModes[e.language]
dismiss: ->
- @recompile() if @spell.hasChangedSignificantly @getSource()
+ @spell.hasChangedSignificantly @getSource(), null, (hasChanged) =>
+ @recompile() if hasChanged
destroy: ->
$(@ace?.container).find('.ace_gutter').off 'click', '.ace_error, .ace_warning, .ace_info', @onAnnotationClick
diff --git a/app/views/play/level/tome/thang_list_entry_view.coffee b/app/views/play/level/tome/thang_list_entry_view.coffee
index 6135a6d53..388a5d10f 100644
--- a/app/views/play/level/tome/thang_list_entry_view.coffee
+++ b/app/views/play/level/tome/thang_list_entry_view.coffee
@@ -156,9 +156,16 @@ module.exports = class ThangListEntryView extends View
@$el.toggleClass('disabled', not enabled)
onFrameChanged: (e) ->
+ # Optimize
return unless currentThang = e.world.thangMap[@thang.id]
- @$el.toggle Boolean(currentThang.exists)
- @$el.toggleClass 'dead', currentThang.health <= 0 if currentThang.exists
+ exists = Boolean currentThang.exists
+ if @thangDidExist isnt exists
+ @$el.toggle exists
+ @thangDidExist = exists
+ dead = exists and currentThang.health <= 0
+ if @thangWasDead isnt dead
+ @$el.toggleClass 'dead', dead
+ @thangWasDead = dead
destroy: ->
@avatar?.destroy()
diff --git a/app/views/play/level/tome/tome_view.coffee b/app/views/play/level/tome/tome_view.coffee
index e7cc1d7e8..1366722e8 100644
--- a/app/views/play/level/tome/tome_view.coffee
+++ b/app/views/play/level/tome/tome_view.coffee
@@ -36,7 +36,7 @@ ThangListView = require './thang_list_view'
SpellPaletteView = require './spell_palette_view'
CastButtonView = require './cast_button_view'
-window.SHIM_WORKER_PATH = '/javascripts/workers/catiline_worker_shim.coffee'
+window.SHIM_WORKER_PATH = '/javascripts/workers/catiline_worker_shim.js'
module.exports = class TomeView extends View
id: 'tome-view'
@@ -51,6 +51,7 @@ module.exports = class TomeView extends View
'tome:change-language': 'updateLanguageForAllSpells'
'surface:sprite-selected': 'onSpriteSelected'
'god:new-world-created': 'onNewWorld'
+ 'tome:comment-my-code': 'onCommentMyCode'
events:
'click #spell-view': 'onSpellViewClick'
@@ -72,33 +73,22 @@ module.exports = class TomeView extends View
delete @options.thangs
onNewWorld: (e) ->
- thangs = _.filter e.world.thangs, 'isSelectable'
+ thangs = _.filter e.world.thangs, 'inThangList'
programmableThangs = _.filter thangs, 'isProgrammable'
@createSpells programmableThangs, e.world
@thangList.adjustThangs @spells, thangs
@spellList.adjustSpells @spells
+ onCommentMyCode: (e) ->
+ for spellKey, spell of @spells when spell.canWrite()
+ console.log "Commenting out", spellKey
+ commentedSource = 'return; // Commented out to stop infinite loop.\n' + spell.getSource()
+ spell.view.updateACEText commentedSource
+ spell.view.recompile false
+ @cast()
+
createWorker: ->
- return
- # In progress
- worker = cw
- initialize: (scope) ->
- self.window = self
- self.global = self
- console.log 'Tome worker initialized.'
- doIt: (data, callback, scope) ->
- console.log 'doing', what
- try
- importScripts '/javascripts/tome_aether.js'
- catch err
- console.log err.toString()
- a = new Aether()
- callback 'good'
- undefined
- onAccepted = (s) -> console.log 'accepted', s
- onRejected = (s) -> console.log 'rejected', s
- worker.doIt('hmm').then onAccepted, onRejected
- worker
+ return new Worker("/javascripts/workers/aether_worker.js")
generateTeamSpellMap: (spellObject) ->
teamSpellMap = {}
@@ -115,6 +105,7 @@ module.exports = class TomeView extends View
return teamSpellMap
createSpells: (programmableThangs, world) ->
+ language = @options.session.get('codeLanguage') ? me.get('aceConfig')?.language ? 'javascript'
pathPrefixComponents = ['play', 'level', @options.levelID, @options.session.id, 'code']
@spells ?= {}
@thangSpells ?= {}
@@ -129,9 +120,18 @@ module.exports = class TomeView extends View
spellKey = pathComponents.join '/'
@thangSpells[thang.id].push spellKey
unless method.cloneOf
- skipProtectAPI = @getQueryVariable "skip_protect_api", not @options.ladderGame
- skipFlow = @getQueryVariable "skip_flow", @options.levelID is 'brawlwood'
- spell = @spells[spellKey] = new Spell programmableMethod: method, spellKey: spellKey, pathComponents: pathPrefixComponents.concat(pathComponents), session: @options.session, supermodel: @supermodel, skipFlow: skipFlow, skipProtectAPI: skipProtectAPI, worker: @worker
+ skipProtectAPI = @getQueryVariable "skip_protect_api", (@options.levelID in ['gridmancer'])
+ spell = @spells[spellKey] = new Spell
+ programmableMethod: method
+ spellKey: spellKey
+ pathComponents: pathPrefixComponents.concat(pathComponents)
+ session: @options.session
+ supermodel: @supermodel
+ skipProtectAPI: skipProtectAPI
+ worker: @worker
+ language: language
+ spectateView: @options.spectateView
+
for thangID, spellKeys of @thangSpells
thang = world.getThangByID thangID
if thang
@@ -149,19 +149,10 @@ module.exports = class TomeView extends View
onCastSpell: (e) ->
# A single spell is cast.
# Hmm; do we need to make sure other spells are all cast here?
- @cast()
+ @cast e?.preload
- cast: ->
- if @options.levelID is 'brawlwood'
- # For performance reasons, only includeFlow on the currently Thang.
- for spellKey, spell of @spells
- for thangID, spellThang of spell.thangs
- hadFlow = Boolean spellThang.aether.options.includeFlow
- willHaveFlow = spellThang is @spellView?.spellThang
- spellThang.aether.options.includeFlow = spellThang.aether.originalOptions.includeFlow = willHaveFlow
- spellThang.aether.transpile spell.source unless hadFlow is willHaveFlow
- #console.log "set includeFlow to", spellThang.aether.options.includeFlow, "for", thangID, "of", spellKey
- Backbone.Mediator.publish 'tome:cast-spells', spells: @spells
+ cast: (preload=false) ->
+ Backbone.Mediator.publish 'tome:cast-spells', spells: @spells, preload: preload
onToggleSpellList: (e) ->
@spellList.rerenderEntries()
@@ -188,14 +179,12 @@ module.exports = class TomeView extends View
thang = e.thang
spellName = e.spellName
@spellList?.$el.hide()
- return @clearSpellView() unless thang?.isProgrammable
- selectedThangSpells = (@spells[spellKey] for spellKey in @thangSpells[thang.id])
- if spellName
- spell = _.find selectedThangSpells, {name: spellName}
- else
- spell = @thangList.topSpellForThang thang
- #spell = selectedThangSpells[0] # TODO: remember last selected spell for this thang
- return @clearSpellView() unless spell?.canRead()
+ return @clearSpellView() unless thang
+ spell = @spellFor thang, spellName
+ unless spell?.canRead()
+ @clearSpellView()
+ @updateSpellPalette thang, spell
+ return
unless spell.view is @spellView
@clearSpellView()
@spellView = spell.view
@@ -208,18 +197,32 @@ module.exports = class TomeView extends View
@spellList.setThangAndSpell thang, spell
@spellView?.setThang thang
@spellTabView?.setThang thang
- if @spellPaletteView?.thang isnt thang
- @spellPaletteView = @insertSubView new SpellPaletteView thang: thang, supermodel: @supermodel
- @spellPaletteView.toggleControls {}, spell.view.controlsEnabled # TODO: know when palette should have been disabled but didn't exist
+ @updateSpellPalette thang, spell
+
+ updateSpellPalette: (thang, spell) ->
+ return unless thang and @spellPaletteView?.thang isnt thang and thang.programmableProperties or thang.apiProperties
+ @spellPaletteView = @insertSubView new SpellPaletteView thang: thang, supermodel: @supermodel, programmable: spell?.canRead()
+ @spellPaletteView.toggleControls {}, spell.view.controlsEnabled if spell # TODO: know when palette should have been disabled but didn't exist
+
+ spellFor: (thang, spellName) ->
+ return null unless thang?.isProgrammable
+ selectedThangSpells = (@spells[spellKey] for spellKey in @thangSpells[thang.id])
+ if spellName
+ spell = _.find selectedThangSpells, {name: spellName}
+ else
+ spell = @thangList.topSpellForThang thang
+ #spell = selectedThangSpells[0] # TODO: remember last selected spell for this thang
+ spell
reloadAllCode: ->
- spell.view.reloadCode false for spellKey, spell of @spells when spell.team is me.team
- Backbone.Mediator.publish 'tome:cast-spells', spells: @spells
+ spell.view.reloadCode false for spellKey, spell of @spells when spell.team is me.team or (spell.team in ["common", "neutral", null])
+ Backbone.Mediator.publish 'tome:cast-spells', spells: @spells, preload: false
- updateLanguageForAllSpells: ->
- spell.updateLanguageAether() for spellKey, spell of @spells
+ updateLanguageForAllSpells: (e) ->
+ spell.updateLanguageAether e.language for spellKey, spell of @spells when spell.canWrite()
+ @cast()
destroy: ->
spell.destroy() for spellKey, spell of @spells
- @worker?._close()
+ @worker?.terminate()
super()
diff --git a/app/views/play/level_view.coffee b/app/views/play/level_view.coffee
index bd60b867f..392198638 100644
--- a/app/views/play/level_view.coffee
+++ b/app/views/play/level_view.coffee
@@ -12,7 +12,7 @@ Surface = require 'lib/surface/Surface'
God = require 'lib/God'
GoalManager = require 'lib/world/GoalManager'
ScriptManager = require 'lib/scripts/ScriptManager'
-LevelBus = require('lib/LevelBus')
+LevelBus = require 'lib/LevelBus'
LevelLoader = require 'lib/LevelLoader'
LevelSession = require 'models/LevelSession'
Level = require 'models/Level'
@@ -60,7 +60,6 @@ module.exports = class PlayLevelView extends View
'surface:world-set-up': 'onSurfaceSetUpNewWorld'
'level:session-will-save': 'onSessionWillSave'
'level:set-team': 'setTeam'
- 'god:new-world-created': 'loadSoundsForWorld'
'level:started': 'onLevelStarted'
'level:loading-view-unveiled': 'onLoadingViewUnveiled'
@@ -70,64 +69,56 @@ module.exports = class PlayLevelView extends View
shortcuts:
'ctrl+s': 'onCtrlS'
+ # Initial Setup #############################################################
+
constructor: (options, @levelID) ->
console.profile?() if PROFILE_ME
super options
if not me.get('hourOfCode') and @getQueryVariable "hour_of_code"
- me.set 'hourOfCode', true
- me.save()
- $('body').append($(""))
- window.tracker?.trackEvent 'Hour of Code Begin', {}
+ @setUpHourOfCode()
@isEditorPreview = @getQueryVariable 'dev'
@sessionID = @getQueryVariable 'session'
$(window).on('resize', @onWindowResize)
- @listenToOnce(@supermodel, 'error', @onLevelLoadError)
@saveScreenshot = _.throttle @saveScreenshot, 30000
if @isEditorPreview
- f = =>
- @supermodel.shouldSaveBackups = (model) ->
- model.constructor.className in ['Level', 'LevelComponent', 'LevelSystem']
- @load() unless @levelLoader
+ # wait to see if it's just given to us through setLevel
+ f = => @load() unless @levelLoader
setTimeout f, 100
else
@load()
+ application.tracker?.trackEvent 'Started Level Load', level: @levelID, label: @levelID
- onLevelLoadError: (e) ->
- application.router.navigate "/play?not_found=#{@levelID}", {trigger: true}
+ setUpHourOfCode: ->
+ me.set 'hourOfCode', true
+ me.save()
+ $('body').append($(""))
+ application.tracker?.trackEvent 'Hour of Code Begin', {}
- setLevel: (@level, @supermodel) ->
- @god?.level = @level.serialize @supermodel
+ setLevel: (@level, givenSupermodel) ->
+ @supermodel.models = givenSupermodel.models
+ @supermodel.collections = givenSupermodel.collections
+ @supermodel.shouldSaveBackups = givenSupermodel.shouldSaveBackups
+
+ serializedLevel = @level.serialize @supermodel
+ @god?.setLevel serializedLevel
if @world
- serializedLevel = @level.serialize(@supermodel)
@world.loadFromLevel serializedLevel, false
else
@load()
load: ->
+ @loadStartTime = new Date()
+ @god = new God debugWorker: true
@levelLoader = new LevelLoader supermodel: @supermodel, levelID: @levelID, sessionID: @sessionID, opponentSessionID: @getQueryVariable('opponent'), team: @getQueryVariable("team")
- @listenToOnce(@levelLoader, 'loaded-all', @onLevelLoaderLoaded)
- @listenTo(@levelLoader, 'progress', @onLevelLoaderProgressChanged)
- @god = new God()
+ @listenToOnce @levelLoader, 'world-necessities-loaded', @onWorldNecessitiesLoaded
- getRenderData: ->
- c = super()
- c.world = @world
- if me.get('hourOfCode') and me.lang() is 'en-US'
- # Show the Hour of Code footer explanation until it's been more than a day
- elapsed = (new Date() - new Date(me.get('dateCreated')))
- c.explainHourOfCode = elapsed < 86400 * 1000
- c
+ # CocoView overridden methods ###############################################
- afterRender: ->
- window.onPlayLevelViewLoaded? @ # still a hack
- @insertSubView @loadingView = new LoadingView {}
- @$el.find('#level-done-button').hide()
- super()
-
- onLevelLoaderProgressChanged: ->
+ updateProgress: (progress) ->
+ super(progress)
return if @seenDocs
return unless @levelLoader.session.loaded and @levelLoader.level.loaded
return unless showFrequency = @levelLoader.level.get('showsGuide')
@@ -142,56 +133,66 @@ module.exports = class PlayLevelView extends View
showGuide: ->
@seenDocs = true
DocsModal = require './level/modal/docs_modal'
- options = {docs: @levelLoader.level.get('documentation'), supermodel: @supermodel}
+ options =
+ docs: @levelLoader.level.get('documentation')
+ supermodel: @supermodel
+ firstOnly: true
@openModalView(new DocsModal(options), true)
- Backbone.Mediator.subscribeOnce 'modal-closed', @onLevelLoaderLoaded, @
+ Backbone.Mediator.subscribeOnce 'modal-closed', @onLevelStarted, @
return true
- onLevelLoaderLoaded: ->
- return unless @levelLoader.progress() is 1 # double check, since closing the guide may trigger this early
- @loadingView.showReady()
- if window.currentModal and not window.currentModal.destroyed
- return Backbone.Mediator.subscribeOnce 'modal-closed', @onLevelLoaderLoaded, @
+ getRenderData: ->
+ c = super()
+ c.world = @world
+ if me.get('hourOfCode') and me.lang() is 'en-US'
+ # Show the Hour of Code footer explanation until it's been more than a day
+ elapsed = (new Date() - new Date(me.get('dateCreated')))
+ c.explainHourOfCode = elapsed < 86400 * 1000
+ c
- # Save latest level played in local storage
- if not (@levelLoader.level.get('type') in ['ladder', 'ladder-tutorial'])
- me.set('lastLevel', @levelID)
- me.save()
+ afterRender: ->
+ super()
+ window.onPlayLevelViewLoaded? @ # still a hack
+ @insertSubView @loadingView = new LoadingView {}
+ @$el.find('#level-done-button').hide()
+ $('body').addClass('is-playing')
+
+ afterInsert: ->
+ super()
+ @showWizardSettingsModal() if not me.get('name')
+
+ # Partially Loaded Setup ####################################################
+
+ onWorldNecessitiesLoaded: ->
+ # Called when we have enough to build the world, but not everything is loaded
@grabLevelLoaderData()
team = @getQueryVariable("team") ? @world.teamForPlayer(0)
@loadOpponentTeam(team)
- @god.level = @level.serialize @supermodel
- @god.worldClassMap = @world.classMap
+ @setupGod()
@setTeam team
- @initSurface()
@initGoalManager()
- @initScriptManager()
- @insertSubviews ladderGame: (@level.get('type') is "ladder")
+ @insertSubviews()
@initVolume()
@listenTo(@session, 'change:multiplayer', @onMultiplayerChanged)
@originalSessionState = $.extend(true, {}, @session.get('state'))
@register()
@controlBar.setBus(@bus)
- @surface.showLevel()
- if @otherSession
- # TODO: colorize name and cloud by team, colorize wizard by user's color config
- @surface.createOpponentWizard id: @otherSession.get('creator'), name: @otherSession.get('creatorName'), team: @otherSession.get('team')
+ @initScriptManager()
grabLevelLoaderData: ->
@session = @levelLoader.session
@world = @levelLoader.world
@level = @levelLoader.level
@otherSession = @levelLoader.opponentSession
- @levelLoader.destroy()
- @levelLoader = null
loadOpponentTeam: (myTeam) ->
opponentSpells = []
for spellTeam, spells of @session.get('teamSpells') ? @otherSession?.get('teamSpells') ? {}
continue if spellTeam is myTeam or not myTeam
opponentSpells = opponentSpells.concat spells
-
- opponentCode = @otherSession?.get('submittedCode') or {}
+ if (not @session.get('teamSpells')) and @otherSession?.get('teamSpells')
+ @session.set('teamSpells',@otherSession.get('teamSpells'))
+ opponentCode = @otherSession?.get('transpiledCode') or {}
myCode = @session.get('code') or {}
for spell in opponentSpells
[thang, spell] = spell.split '/'
@@ -203,41 +204,107 @@ module.exports = class PlayLevelView extends View
# For now, ladderGame will disallow multiplayer, because session code combining doesn't play nice yet.
@session.set 'multiplayer', false
- onLevelStarted: (e) ->
- @loadingView?.unveil()
+ setupGod: ->
+ @god.setLevel @level.serialize @supermodel
+ @god.setLevelSessionIDs if @otherSession then [@session.id, @otherSession.id] else [@session.id]
+ @god.setWorldClassMap @world.classMap
- onLoadingViewUnveiled: (e) ->
- @removeSubView @loadingView
- @loadingView = null
+ setTeam: (team) ->
+ team = team?.team unless _.isString team
+ team ?= 'humans'
+ me.team = team
+ Backbone.Mediator.publish 'level:team-set', team: team
+ @team = team
- onSupermodelLoadedOne: =>
- @modelsLoaded ?= 0
- @modelsLoaded += 1
- @updateInitString()
+ initGoalManager: ->
+ @goalManager = new GoalManager(@world, @level.get('goals'), @team)
+ @god.setGoalManager @goalManager
- updateInitString: ->
- return if @surface
- @modelsLoaded ?= 0
- canvas = @$el.find('#surface')[0]
- ctx = canvas.getContext('2d')
- ctx.font="20px Georgia"
- ctx.clearRect(0, 0, canvas.width, canvas.height)
- ctx.fillText("Loaded #{@modelsLoaded} thingies",50,50)
-
- insertSubviews: (subviewOptions) ->
- @insertSubView @tome = new TomeView levelID: @levelID, session: @session, thangs: @world.thangs, supermodel: @supermodel, ladderGame: subviewOptions.ladderGame
- @insertSubView new PlaybackView {}
+ insertSubviews: ->
+ @insertSubView @tome = new TomeView levelID: @levelID, session: @session, thangs: @world.thangs, supermodel: @supermodel
+ @insertSubView new PlaybackView session: @session
@insertSubView new GoalsView {}
@insertSubView new GoldView {}
@insertSubView new HUDView {}
@insertSubView new ChatView levelID: @levelID, sessionID: @session.id, session: @session
worldName = utils.i18n @level.attributes, 'name'
- @controlBar = @insertSubView new ControlBarView {worldName: worldName, session: @session, level: @level, supermodel: @supermodel, playableTeams: @world.playableTeams, ladderGame: subviewOptions.ladderGame}
- #Backbone.Mediator.publish('level-set-debug', debug: true) if me.displayName() is 'Nick!'
+ @controlBar = @insertSubView new ControlBarView {worldName: worldName, session: @session, level: @level, supermodel: @supermodel, playableTeams: @world.playableTeams}
+ #Backbone.Mediator.publish('level-set-debug', debug: true) if me.displayName() is 'Nick!'
- afterInsert: ->
- super()
- @showWizardSettingsModal() if not me.get('name')
+ initVolume: ->
+ volume = me.get('volume')
+ volume = 1.0 unless volume?
+ Backbone.Mediator.publish 'level-set-volume', volume: volume
+
+ initScriptManager: ->
+ @scriptManager = new ScriptManager({scripts: @world.scripts or [], view:@, session: @session})
+ @scriptManager.loadFromSession()
+
+ register: ->
+ @bus = LevelBus.get(@levelID, @session.id)
+ @bus.setSession(@session)
+ @bus.setSpells @tome.spells
+ @bus.connect() if @session.get('multiplayer')
+
+ # Load Completed Setup ######################################################
+
+ onLoaded: ->
+ _.defer => @onLevelLoaded()
+
+ onLevelLoaded: ->
+ # Everything is now loaded
+ return unless @levelLoader.progress() is 1 # double check, since closing the guide may trigger this early
+
+ # Save latest level played in local storage
+ if not (@levelLoader.level.get('type') in ['ladder', 'ladder-tutorial'])
+ me.set('lastLevel', @levelID)
+ me.save()
+ @levelLoader.destroy()
+ @levelLoader = null
+ @initSurface()
+
+ initSurface: ->
+ surfaceCanvas = $('canvas#surface', @$el)
+ @surface = new Surface(@world, surfaceCanvas, thangTypes: @supermodel.getModels(ThangType), playJingle: not @isEditorPreview)
+ worldBounds = @world.getBounds()
+ bounds = [{x:worldBounds.left, y:worldBounds.top}, {x:worldBounds.right, y:worldBounds.bottom}]
+ @surface.camera.setBounds(bounds)
+ @surface.camera.zoomTo({x:0, y:0}, 0.1, 0)
+
+ # Once Surface is Loaded ####################################################
+
+ onLevelStarted: ->
+ @loadingView.showReady()
+ if window.currentModal and not window.currentModal.destroyed
+ return Backbone.Mediator.subscribeOnce 'modal-closed', @onLevelStarted, @
+ @surface.showLevel()
+ if @otherSession
+ # TODO: colorize name and cloud by team, colorize wizard by user's color config
+ @surface.createOpponentWizard id: @otherSession.get('creator'), name: @otherSession.get('creatorName'), team: @otherSession.get('team')
+ @loadingView?.unveil()
+
+ onLoadingViewUnveiled: (e) ->
+ @loadingView.$el.remove()
+ @removeSubView @loadingView
+ @loadingView = null
+ unless @isEditorPreview
+ @loadEndTime = new Date()
+ loadDuration = @loadEndTime - @loadStartTime
+ console.debug "Level unveiled after #{(loadDuration / 1000).toFixed(2)}s"
+ application.tracker?.trackEvent 'Finished Level Load', level: @levelID, label: @levelID, loadDuration: loadDuration
+ application.tracker?.trackTiming loadDuration, 'Level Load Time', @levelID, @levelID
+
+ onSurfaceSetUpNewWorld: ->
+ return if @alreadyLoadedState
+ @alreadyLoadedState = true
+ state = @originalSessionState
+ if state.frame and @level.get('type') isnt 'ladder' # https://github.com/codecombat/codecombat/issues/714
+ Backbone.Mediator.publish 'level-set-time', { time: 0, frameOffset: state.frame }
+ if state.selected
+ # TODO: Should also restore selected spell here by saving spellName
+ Backbone.Mediator.publish 'level-select-sprite', { thangID: state.selected, spellName: null }
+ if state.playing?
+ Backbone.Mediator.publish 'level-set-playing', { playing: state.playing }
# callbacks
@@ -272,28 +339,30 @@ module.exports = class PlayLevelView extends View
$('#level-done-button').show()
@showVictory() if e.showModal
setTimeout(@preloadNextLevel, 3000)
+ return if @victorySeen
+ @victorySeen = true
+ victoryTime = (new Date()) - @loadEndTime
+ if victoryTime > 10 * 1000 # Don't track it if we're reloading an already-beaten level
+ application.tracker?.trackEvent 'Saw Victory', level: @level.get('name'), label: @level.get('name')
+ application.tracker?.trackTiming victoryTime, 'Level Victory Time', @levelID, @levelID, 100
showVictory: ->
options = {level: @level, supermodel: @supermodel, session: @session}
docs = new VictoryModal(options)
@openModalView(docs)
- window.tracker?.trackEvent 'Saw Victory', level: @world.name, label: @world.name
if me.get('anonymous')
- window.nextLevelURL = @getNextLevelID() # Signup will go here on completion instead of reloading.
+ window.nextLevelURL = @getNextLevelURL() # Signup will go here on completion instead of reloading.
onRestartLevel: ->
@tome.reloadAllCode()
Backbone.Mediator.publish 'level:restarted'
$('#level-done-button', @$el).hide()
- window.tracker?.trackEvent 'Confirmed Restart', level: @world.name, label: @world.name
-
- onNewWorld: (e) ->
- @world = e.world
+ application.tracker?.trackEvent 'Confirmed Restart', level: @level.get('name'), label: @level.get('name')
onInfiniteLoop: (e) ->
return unless e.firstWorld
@openModalView new InfiniteLoopModal()
- window.tracker?.trackEvent 'Saw Initial Infinite Loop', level: @world.name, label: @world.name
+ application.tracker?.trackEvent 'Saw Initial Infinite Loop', level: @level.get('name'), label: @level.get('name')
onPlayNextLevel: ->
nextLevelID = @getNextLevelID()
@@ -304,15 +373,17 @@ module.exports = class PlayLevelView extends View
viewArgs: [{supermodel:@supermodel}, nextLevelID]}
getNextLevel: ->
- nextLevelOriginal = @level.get('nextLevel')?.original
+ return null unless nextLevelOriginal = @level.get('nextLevel')?.original
levels = @supermodel.getModels(Level)
return l for l in levels when l.get('original') is nextLevelOriginal
getNextLevelID: ->
- nextLevel = @getNextLevel()
+ return null unless nextLevel = @getNextLevel()
nextLevelID = nextLevel.get('slug') or nextLevel.id
- getNextLevelURL: -> "/play/level/#{@getNextLevelID()}"
+ getNextLevelURL: ->
+ return null unless @getNextLevelID()
+ "/play/level/#{@getNextLevelID()}"
onHighlightDom: (e) ->
if e.delay
@@ -361,14 +432,15 @@ module.exports = class PlayLevelView extends View
.css('transform', "rotate(#{@pointerRotation}rad) translate(-3px, #{@pointerRadialDistance}px)")
.css('top', target_top - 50)
.css('left', target_left - 50)
- setTimeout((=>
+ setTimeout(()=>
+ return if @destroyed
@animatePointer()
clearInterval(@pointerInterval)
@pointerInterval = setInterval(@animatePointer, 1200)
- ), 1)
+ , 1)
- animatePointer: ->
+ animatePointer: =>
pointer = $('#pointer')
pointer.css('transition', 'all 0.6s ease-out')
pointer.css('transform', "rotate(#{@pointerRotation}rad) translate(-3px, #{@pointerRadialDistance-50}px)")
@@ -388,46 +460,11 @@ module.exports = class PlayLevelView extends View
@bus.removeFirebaseData =>
@bus.disconnect()
- # initialization
-
addPointer: ->
p = $('#pointer')
return if p.length
@$el.append($('
'))
- initSurface: ->
- surfaceCanvas = $('canvas#surface', @$el)
- @surface = new Surface(@world, surfaceCanvas, thangTypes: @supermodel.getModels(ThangType), playJingle: not @isEditorPreview)
- worldBounds = @world.getBounds()
- bounds = [{x:worldBounds.left, y:worldBounds.top}, {x:worldBounds.right, y:worldBounds.bottom}]
- @surface.camera.setBounds(bounds)
- @surface.camera.zoomTo({x:0, y:0}, 0.1, 0)
-
- initGoalManager: ->
- @goalManager = new GoalManager(@world, @level.get('goals'))
- @god.goalManager = @goalManager
-
- initScriptManager: ->
- @scriptManager = new ScriptManager({scripts: @world.scripts or [], view:@, session: @session})
- @scriptManager.loadFromSession()
-
- initVolume: ->
- volume = me.get('volume')
- volume = 1.0 unless volume?
- Backbone.Mediator.publish 'level-set-volume', volume: volume
-
- onSurfaceSetUpNewWorld: ->
- return if @alreadyLoadedState
- @alreadyLoadedState = true
- state = @originalSessionState
- if state.frame
- Backbone.Mediator.publish 'level-set-time', { time: 0, frameOffset: state.frame }
- if state.selected
- # TODO: Should also restore selected spell here by saving spellName
- Backbone.Mediator.publish 'level-select-sprite', { thangID: state.selected, spellName: null }
- if state.playing?
- Backbone.Mediator.publish 'level-set-playing', { playing: state.playing }
-
preloadNextLevel: =>
# TODO: Loading models in the middle of gameplay causes stuttering. Most of the improvement in loading time is simply from passing the supermodel from this level to the next, but if we can find a way to populate the level early without it being noticeable, that would be even better.
# return if @destroyed
@@ -436,34 +473,24 @@ module.exports = class PlayLevelView extends View
# @supermodel.populateModel nextLevel
# @preloaded = true
- register: ->
- @bus = LevelBus.get(@levelID, @session.id)
- @bus.setSession(@session)
- @bus.setSpells @tome.spells
- @bus.connect() if @session.get('multiplayer')
-
onSessionWillSave: (e) ->
# Something interesting has happened, so (at a lower frequency), we'll save a screenshot.
- @saveScreenshot e.session
+ #@saveScreenshot e.session
# Throttled
saveScreenshot: (session) =>
return unless screenshot = @surface?.screenshot()
session.save {screenshot: screenshot}, {patch: true}
- setTeam: (team) ->
- team = team?.team unless _.isString team
- team ?= 'humans'
- me.team = team
- Backbone.Mediator.publish 'level:team-set', team: team
-
# Dynamic sound loading
- loadSoundsForWorld: (e) ->
+ onNewWorld: (e) ->
return if @headless
- world = e.world
+ scripts = @world.scripts # Since these worlds don't have scripts, preserve them.
+ @world = e.world
+ @world.scripts = scripts
thangTypes = @supermodel.getModels(ThangType)
- for [spriteName, message] in world.thangDialogueSounds()
+ for [spriteName, message] in @world.thangDialogueSounds()
continue unless thangType = _.find thangTypes, (m) -> m.get('name') is spriteName
continue unless sound = AudioPlayer.soundForDialogue message, thangType.get('soundTriggers')
AudioPlayer.preloadSoundReference sound
diff --git a/app/views/play/spectate_view.coffee b/app/views/play/spectate_view.coffee
index da6f5e611..76e5430ca 100644
--- a/app/views/play/spectate_view.coffee
+++ b/app/views/play/spectate_view.coffee
@@ -8,7 +8,7 @@ World = require 'lib/world/world'
# tools
Surface = require 'lib/surface/Surface'
-God = require 'lib/God'
+God = require 'lib/God' # 'lib/Buddha'
GoalManager = require 'lib/world/GoalManager'
ScriptManager = require 'lib/scripts/ScriptManager'
LevelLoader = require 'lib/LevelLoader'
@@ -90,9 +90,9 @@ module.exports = class SpectateLevelView extends View
application.router.navigate "/play?not_found=#{@levelID}", {trigger: true}
setLevel: (@level, @supermodel) ->
- @god?.level = @level.serialize @supermodel
+ serializedLevel = @level.serialize @supermodel
+ @god?.setLevel serializedLevel
if @world
- serializedLevel = @level.serialize(@supermodel)
@world.loadFromLevel serializedLevel, false
else
@load()
@@ -106,8 +106,7 @@ module.exports = class SpectateLevelView extends View
spectateMode: true
team: @getQueryVariable("team")
@listenToOnce(@levelLoader, 'loaded-all', @onLevelLoaderLoaded)
- @listenTo(@levelLoader, 'progress', @onLevelLoaderProgressChanged)
- @god = new God maxWorkerPoolSize: 1, maxAngels: 1
+ @god = new God maxAngels: 1
getRenderData: ->
c = super()
@@ -119,8 +118,10 @@ module.exports = class SpectateLevelView extends View
@insertSubView @loadingView = new LoadingView {}
@$el.find('#level-done-button').hide()
super()
+ $('body').addClass('is-playing')
- onLevelLoaderProgressChanged: ->
+ updateProgress: (progress) ->
+ super(progress)
return if @seenDocs
return unless showFrequency = @levelLoader.level.get('showGuide')
session = @levelLoader.session
@@ -140,7 +141,10 @@ module.exports = class SpectateLevelView extends View
Backbone.Mediator.subscribeOnce 'modal-closed', @onLevelLoaderLoaded, @
return true
- onLevelLoaderLoaded: ->
+ onLoaded: ->
+ _.defer => @onLevelLoaded()
+
+ onLevelLoaded: ->
return unless @levelLoader.progress() is 1 # double check, since closing the guide may trigger this early
# Save latest level played in local storage
if window.currentModal and not window.currentModal.destroyed
@@ -151,13 +155,14 @@ module.exports = class SpectateLevelView extends View
#at this point, all requisite data is loaded, and sessions are not denormalized
team = @world.teamForPlayer(0)
@loadOpponentTeam(team)
- @god.level = @level.serialize @supermodel
- @god.worldClassMap = @world.classMap
+ @god.setLevel @level.serialize @supermodel
+ @god.setLevelSessionIDs if @otherSession then [@session.id, @otherSession.id] else [@session.id]
+ @god.setWorldClassMap @world.classMap
@setTeam team
@initSurface()
@initGoalManager()
@initScriptManager()
- @insertSubviews ladderGame: @otherSession?
+ @insertSubviews()
@initVolume()
@originalSessionState = $.extend(true, {}, @session.get('state'))
@@ -191,13 +196,14 @@ module.exports = class SpectateLevelView extends View
continue if spellTeam is myTeam or not myTeam
opponentSpells = opponentSpells.concat spells
- opponentCode = @otherSession?.get('submittedCode') or {}
- myCode = @session.get('submittedCode') or {}
+ opponentCode = @otherSession?.get('transpiledCode') or {}
+ myCode = @session.get('transpiledCode') or {}
for spell in opponentSpells
[thang, spell] = spell.split '/'
c = opponentCode[thang]?[spell]
myCode[thang] ?= {}
if c then myCode[thang][spell] = c else delete myCode[thang][spell]
+
@session.set('code', myCode)
if @session.get('multiplayer') and @otherSession?
# For now, ladderGame will disallow multiplayer, because session code combining doesn't play nice yet.
@@ -207,8 +213,9 @@ module.exports = class SpectateLevelView extends View
@loadingView?.unveil()
onLoadingViewUnveiled: (e) ->
- @removeSubView @loadingView
- @loadingView = null
+ # Don't remove it; we want its decoration around on large screens.
+ #@removeSubView @loadingView
+ #@loadingView = null
onSupermodelLoadedOne: =>
@modelsLoaded ?= 0
@@ -224,8 +231,8 @@ module.exports = class SpectateLevelView extends View
ctx.clearRect(0, 0, canvas.width, canvas.height)
ctx.fillText("Loaded #{@modelsLoaded} thingies",50,50)
- insertSubviews: (subviewOptions) ->
- @insertSubView @tome = new TomeView levelID: @levelID, session: @session, thangs: @world.thangs, supermodel: @supermodel, ladderGame: subviewOptions.ladderGame
+ insertSubviews: ->
+ @insertSubView @tome = new TomeView levelID: @levelID, session: @session, thangs: @world.thangs, supermodel: @supermodel, spectateView: true
@insertSubView new PlaybackView {}
@insertSubView new GoldView {}
@@ -382,7 +389,7 @@ module.exports = class SpectateLevelView extends View
initGoalManager: ->
@goalManager = new GoalManager(@world, @level.get('goals'))
- @god.goalManager = @goalManager
+ @god.setGoalManager @goalManager
initScriptManager: ->
if @world.scripts
diff --git a/app/views/play_view.coffee b/app/views/play_view.coffee
index 349f900c7..8662ecef4 100644
--- a/app/views/play_view.coffee
+++ b/app/views/play_view.coffee
@@ -1,7 +1,7 @@
View = require 'views/kinds/RootView'
template = require 'templates/play'
LevelSession = require 'models/LevelSession'
-CocoCollection = require 'models/CocoCollection'
+CocoCollection = require 'collections/CocoCollection'
class LevelSessionsCollection extends CocoCollection
url: ''
@@ -138,11 +138,19 @@ module.exports = class PlayView extends View
difficulty: 5
id: 'gridmancer'
image: '/file/db/level/52ae2460ef42c52f13000008/gridmancer_icon.png'
- description: "Challenge! Beat this level, get a job!"
+ description: "Super algorithm challenge level!"
}
]
arenas = [
+ {
+ name: 'Greed'
+ difficulty: 4
+ id: 'greed'
+ image: '/file/db/level/526fd3043c637ece50001bb2/the_herd_icon.png'
+ description: "Liked Dungeon Arena and Gold Rush? Put them together in this economic arena!"
+ levelPath: 'ladder'
+ }
{
name: 'Dungeon Arena'
difficulty: 3
@@ -151,6 +159,14 @@ module.exports = class PlayView extends View
description: "Play head-to-head against fellow Wizards in a dungeon melee!"
levelPath: 'ladder'
}
+ {
+ name: 'Gold Rush'
+ difficulty: 3
+ id: 'gold-rush'
+ image: '/file/db/level/52602ecb026e8481e7000001/generic_1.png'
+ description: "Prove you are better at collecting gold than your opponent!"
+ levelPath: 'ladder'
+ }
{
name: 'Brawlwood'
difficulty: 4
@@ -204,6 +220,21 @@ module.exports = class PlayView extends View
image: '/file/db/level/526fd3043c637ece50001bb2/the_herd_icon.png'
description: "Transfer a stack of ogres while preserving their honor. - by Alexandru"
}
+ {
+ name: 'Find the Spy'
+ difficulty: 2
+ id: 'find-the-spy'
+ image: '/file/db/level/526ae95c1e5cd30000000008/zone_of_danger_icon.png'
+ description: "Identify the spies hidden among your soldiers - by Nathan Gossett"
+ }
+ {
+ name: 'Harvest Time'
+ difficulty: 2
+ id: 'harvest-time'
+ image: '/file/db/level/529662dfe0df8f0000000007/grab_the_mushroom_icon.png'
+ description: "Collect a hundred mushrooms in just five lines of code - by Nathan Gossett"
+ }
+
#{
# name: 'Enemy Artillery'
# difficulty: 1
diff --git a/bin/coco-brunch b/bin/coco-brunch
index 6ebf85db5..9afe5e7c7 100755
--- a/bin/coco-brunch
+++ b/bin/coco-brunch
@@ -9,7 +9,7 @@ import sys
current_directory = os.path.dirname(os.path.realpath(sys.argv[0]))
coco_path = os.getenv("COCO_DIR",os.path.join(current_directory,os.pardir))
brunch_path = coco_path + os.sep + "node_modules" + os.sep + ".bin" + os.sep + "brunch"
-subprocess.Popen("ulimit -n 10000",shell=True)
+subprocess.Popen("ulimit -n 100000",shell=True)
while True:
print("Starting brunch. After the first compile, it'll keep running and watch for changes.")
call(brunch_path + " w",shell=True,cwd=coco_path)
diff --git a/bin/coco-dev-server b/bin/coco-dev-server
index c76923672..e30367130 100755
--- a/bin/coco-dev-server
+++ b/bin/coco-dev-server
@@ -8,5 +8,5 @@ current_directory = os.path.dirname(os.path.realpath(sys.argv[0]))
coco_path = os.getenv("COCO_DIR",os.path.join(current_directory,os.pardir))
nodemon_path = coco_path + os.sep + "node_modules" + os.sep + ".bin" + os.sep + "nodemon"
-call(nodemon_path + " . --ext \".coffee|.js\" --watch server --watch app.js --watch server_config.js --watch server_setup.coffee",shell=True,cwd=coco_path)
+call(nodemon_path + " . --ext \".coffee|.js\" --watch server --watch server_config.js --watch server_setup.coffee --watch app" + os.sep + "schemas",shell=True,cwd=coco_path)
diff --git a/bower.json b/bower.json
index e73834bc5..f04a51d91 100644
--- a/bower.json
+++ b/bower.json
@@ -24,19 +24,26 @@
"test"
],
"dependencies": {
- "jquery": "~2.0.3",
+ "jquery": "~2.1.0",
"lodash": "~2.4.1",
"backbone": "1.1.0",
"jquery-mousewheel": "~3.1.9",
- "i18next": "~1.7.1",
+ "i18next": "git://github.com/nwinter/i18next.git",
"firepad": "~0.1.2",
"marked": "~0.3.0",
"moment": "~2.5.0",
- "aether": "~0.1.18",
+ "aether": "~0.2.8",
"underscore.string": "~2.3.3",
"firebase": "~1.0.2",
"catiline": "~2.9.3",
- "d3": "~3.4.4"
+ "d3": "~3.4.4",
+ "jsondiffpatch": "~0.1.5",
+ "nanoscroller": "~0.8.0",
+ "jquery.tablesorter": "~2.15.13",
+ "treema": "~0.0.8",
+ "bootstrap": "~3.1.1",
+ "validated-backbone-mediator": "~0.1.3",
+ "jquery.browser": "~0.0.6"
},
"overrides": {
"backbone": {
@@ -50,6 +57,29 @@
},
"underscore.string": {
"main": "lib/underscore.string.js"
+ },
+ "jsondiffpatch": {
+ "main": [
+ "build/bundle-full.js",
+ "build/formatters.js",
+ "src/formatters/html.css"
+ ]
+ },
+ "jquery.tablesorter": {
+ "main": [
+ "js/jquery.tablesorter.js",
+ "js/jquery.tablesorter.widgets.js",
+ "css/theme.bootstrap.css"
+ ]
+ },
+ "bootstrap": {
+ "main": [
+ "./dist/js/bootstrap.js",
+ "./dist/fonts/glyphicons-halflings-regular.eot",
+ "./dist/fonts/glyphicons-halflings-regular.svg",
+ "./dist/fonts/glyphicons-halflings-regular.ttf",
+ "./dist/fonts/glyphicons-halflings-regular.woff"
+ ]
}
}
}
diff --git a/config.coffee b/config.coffee
index 1a860cb76..55b9888b4 100644
--- a/config.coffee
+++ b/config.coffee
@@ -11,6 +11,7 @@ exports.config =
ignored: (path) -> startsWith(sysPath.basename(path), '_')
workers:
enabled: false # turned out to be much, much slower than without workers
+ sourceMaps: true
files:
javascripts:
defaultExtension: 'coffee'
@@ -21,58 +22,54 @@ exports.config =
|(app[\/\\]lib[\/\\]utils.coffee)
|(vendor[\/\\]scripts[\/\\]Box2dWeb-2.1.a.3)
|(vendor[\/\\]scripts[\/\\]string_score.js)
- |(bower_components[\/\\]lodash[\/\\]dist[\/\\]lodash.js)
- |(bower_components[\/\\]aether[\/\\]build[\/\\]aether.js)
)///
'javascripts/app.js': /^app/
'javascripts/vendor.js': ///^(
vendor[\/\\](?!scripts[\/\\]Box2d)
- |bower_components
+ |bower_components[\/\\](?!aether)
)///
'javascripts/vendor_with_box2d.js': ///^(
vendor[\/\\]
- |bower_components # include box2dweb for profiling (and for IE9...)
+ |bower_components[\/\\](?!aether) # include box2dweb for profiling (and for IE9...)
)///
- 'javascripts/tome_aether.js': ///^(
+ 'javascripts/lodash.js': ///^(
(bower_components[\/\\]lodash[\/\\]dist[\/\\]lodash.js)
- |(bower_components[\/\\]aether[\/\\]build[\/\\]aether.js)
)///
- 'test/javascripts/test.js': /^test[\/\\](?!vendor)/
- 'test/javascripts/test-vendor.js': /^test[\/\\](?=vendor)/
+ 'javascripts/aether.js': ///^(
+ (bower_components[\/\\]aether[\/\\]build[\/\\]aether.js)
+ )///
+# 'test/javascripts/test.js': /^test[\/\\](?!vendor)/
+# 'test/javascripts/test-vendor.js': /^test[\/\\](?=vendor)/
order:
before: [
- 'bower_components/jquery/jquery.js'
+ 'bower_components/jquery/dist/jquery.js'
'bower_components/lodash/dist/lodash.js'
'bower_components/backbone/backbone.js'
# Twitter Bootstrap jquery plugins
- 'vendor/scripts/bootstrap/transition.js'
- 'vendor/scripts/bootstrap/affix.js'
- 'vendor/scripts/bootstrap/alert.js'
- 'vendor/scripts/bootstrap/button.js'
- 'vendor/scripts/bootstrap/carousel.js'
- 'vendor/scripts/bootstrap/collapse.js'
- 'vendor/scripts/bootstrap/dropdown.js'
- 'vendor/scripts/bootstrap/modal.js'
- 'vendor/scripts/bootstrap/scrollspy.js'
- 'vendor/scripts/bootstrap/tab.js'
- 'vendor/scripts/bootstrap/tooltip.js'
+ 'bower_components/bootstrap/dist/bootstrap.js'
# CreateJS dependencies
'vendor/scripts/easeljs-NEXT.combined.js'
'vendor/scripts/preloadjs-NEXT.combined.js'
'vendor/scripts/soundjs-NEXT.combined.js'
'vendor/scripts/tweenjs-NEXT.combined.js'
'vendor/scripts/movieclip-NEXT.min.js'
+ # Validated Backbone Mediator dependencies
+ 'bower_components/tv4/tv4.js'
# Aether before box2d for some strange Object.defineProperty thing
'bower_components/aether/build/aether.js'
'bower_components/d3/d3.min.js'
+ 'vendor/scripts/async.js'
]
stylesheets:
defaultExtension: 'sass'
joinTo:
- 'stylesheets/app.css': /^(app|vendor)/
+ 'stylesheets/app.css': /^(app|vendor|bower_components)/
order:
- before: ['app/styles/bootstrap.scss']
+ before: [
+ 'app/styles/bootstrap.scss'
+ 'vendor/styles/nanoscroller.scss'
+ ]
templates:
defaultExtension: 'jade'
joinTo: 'javascripts/app.js'
diff --git a/headless_client.coffee b/headless_client.coffee
new file mode 100644
index 000000000..bdd7eeded
--- /dev/null
+++ b/headless_client.coffee
@@ -0,0 +1,217 @@
+###
+This file will simulate games on node.js by emulating the browser environment.
+###
+simulateOneGame = false
+if process.argv[2] is "one-game"
+ #calculate result of one game here
+ simulateOneGame = true
+ console.log "Simulating #{process.argv[3]} vs #{process.argv[4]}"
+bowerComponentsPath = "./bower_components/"
+headlessClientPath = "./headless_client/"
+
+# SETTINGS
+options =
+ workerCode: require headlessClientPath + 'worker_world'
+ debug: false # Enable logging of ajax calls mainly
+ testing: false # Instead of simulating 'real' games, use the same one over and over again. Good for leak hunting.
+ testFile: require headlessClientPath + 'test.js'
+ leakTest: false # Install callback that tries to find leaks automatically
+ exitOnLeak: false # Exit if leak is found. Only useful if leaktest is set to true, obviously.
+ heapdump: false # Dumps the whole heap after every pass. The heap dumps can then be viewed in Chrome browser.
+ headlessClient: true
+
+options.heapdump = require('heapdump') if options.heapdump
+server = if options.testing then "http://127.0.0.1:3000" else "http://codecombat.com"
+
+# Disabled modules
+disable = [
+ 'lib/AudioPlayer'
+ 'locale/locale'
+ '../locale/locale'
+]
+
+# Start of the actual code. Setting up the enivronment to match the environment of the browser
+
+# the path used for the loader. __dirname is module dependent.
+path = __dirname
+
+m = require 'module'
+request = require 'request'
+Deferred = require "JQDeferred"
+originalLoader = m._load
+
+unhook = () ->
+ m._load = originalLoader
+
+hook = () ->
+ m._load = hookedLoader
+
+
+JASON = require 'jason'
+
+# Global emulated stuff
+GLOBAL.window = GLOBAL
+GLOBAL.document = location: pathname: "headless_client"
+GLOBAL.console.debug = console.log
+
+GLOBAL.Worker = require('webworker-threads').Worker
+Worker::removeEventListener = (what) ->
+ if what is 'message'
+ @onmessage = -> #This webworker api has only one event listener at a time.
+
+GLOBAL.tv4 = require('tv4').tv4
+
+GLOBAL.marked = setOptions: ->
+
+store = {}
+GLOBAL.localStorage =
+ getItem: (key) => store[key]
+ setItem: (key, s) => store[key] = s
+ removeItem: (key) => delete store[key]
+
+# Hook node.js require. See https://github.com/mfncooper/mockery/blob/master/mockery.js
+# The signature of this function *must* match that of Node's Module._load,
+# since it will replace that.
+# (Why is there no easier way?)
+hookedLoader = (request, parent, isMain) ->
+ if request in disable or ~request.indexOf('templates')
+ console.log 'Ignored ' + request if options.debug
+ return class fake
+ else if '/' in request and not (request[0] is '.') or request is 'application'
+ request = path + '/app/' + request
+ else if request is 'underscore'
+ request = 'lodash'
+
+ console.log "loading " + request if options.debug
+ originalLoader request, parent, isMain
+
+
+#jQuery wrapped for compatibility purposes. Poorly.
+GLOBAL.$ = GLOBAL.jQuery = (input) ->
+ console.log 'Ignored jQuery: ' + input if options.debug
+ append: (input)-> exports: ()->
+
+cookies = request.jar()
+$.when = Deferred.when
+
+$.ajax = (options) ->
+ responded = false
+ url = options.url
+ if url.indexOf('http')
+ url = '/' + url unless url[0] is '/'
+ url = server + url
+
+ data = options.data
+
+
+ #if (typeof data) is 'object'
+ #console.warn JSON.stringify data
+ #data = JSON.stringify data
+
+ console.log "Requesting: " + JSON.stringify options if options.debug
+ console.log "URL: " + url if options.debug
+
+ deferred = Deferred()
+
+ request
+ url: url
+ jar: cookies
+ json: options.parse
+ method: options.type
+ body: data
+ , (error, response, body) ->
+ console.log "HTTP Request:" + JSON.stringify options if options.debug and not error
+
+ if responded
+ console.log "\t↳Already returned before." if options.debug
+ return
+
+ if (error)
+ console.warn "\t↳Returned: error: #{error}"
+ options.error(error) if options.error?
+ deferred.reject()
+
+ else
+ console.log "\t↳Returned: statusCode #{response.statusCode}: #{if options.parse then JSON.stringify body else body}" if options.debug
+ options.success(body, response, status: response.statusCode) if options.success?
+ deferred.resolve()
+
+ statusCode = response.statusCode if response?
+ options.complete(status: statusCode) if options.complete?
+ responded = true
+
+ deferred.promise()
+
+
+$.extend = (deep, into, from) ->
+ copy = _.clone(from, deep);
+ if into
+ _.assign into, copy
+ copy = into
+ copy
+
+$.isArray = (object) ->
+ _.isArray object
+
+$.isPlainObject = (object) ->
+ _.isPlainObject object
+
+
+do (setupLodash = this) ->
+ GLOBAL._ = require 'lodash'
+ _.str = require 'underscore.string'
+ _.string = _.str
+ _.mixin _.str.exports()
+
+
+# load Backbone. Needs hooked loader to reroute underscore to lodash.
+hook()
+GLOBAL.Backbone = require bowerComponentsPath + 'backbone/backbone'
+unhook()
+Backbone.$ = $
+
+require bowerComponentsPath + 'validated-backbone-mediator/backbone-mediator'
+# Instead of mediator, dummy might be faster yet suffice?
+#Mediator = class Mediator
+# publish: (id, object) ->
+# console.Log "Published #{id}: #{object}"
+# @subscribe: () ->
+# @unsubscribe: () ->
+
+GLOBAL.Aether = require 'aether'
+
+# Set up new loader.
+hook()
+
+login = require './login.coffee' #should contain an object containing they keys 'username' and 'password'
+
+#Login user and start the code.
+$.ajax
+ url: '/auth/login'
+ type: "POST"
+ data: login
+ parse: true
+ error: (error) -> "Bad Error. Can't connect to server or something. " + error
+ success: (response) ->
+ console.log "User: " + JSON.stringify response
+ GLOBAL.window.userObject = response # JSON.parse response
+
+ User = require 'models/User'
+
+ World = require 'lib/world/world'
+ LevelLoader = require 'lib/LevelLoader'
+ GoalManager = require 'lib/world/GoalManager'
+
+ SuperModel = require 'models/SuperModel'
+
+ log = require 'winston'
+
+ CocoClass = require 'lib/CocoClass'
+
+ Simulator = require 'lib/simulator/Simulator'
+
+ sim = new Simulator options
+ if simulateOneGame
+ sim.fetchAndSimulateOneGame(process.argv[3],process.argv[4])
+ else
+ sim.fetchAndSimulateTask()
diff --git a/headless_client/test.js b/headless_client/test.js
new file mode 100644
index 000000000..fdd51bf83
--- /dev/null
+++ b/headless_client/test.js
@@ -0,0 +1,87 @@
+module.exports = {
+ "messageGenerated": 1396792689279,
+ "sessions": [
+ {
+ "sessionID": "533a2c4893b95d9319a58049",
+ "submitDate": "2014-04-06T06:31:11.806Z",
+ "team": "humans",
+ "code": {
+ "ogre-base": {
+ "chooseAction": "// This is the code for your base. Decide which unit to build each frame.\n// Units you build will go into the this.built array.\n// Destroy the enemy base within 60 seconds!\n// Check out the Guide at the top for more info.\n\n// Choose your hero! You can only build one hero.\nvar hero;\n//hero = 'ironjaw'; // A leaping juggernaut hero, type 'brawler'.\nhero = 'yugargen'; // A devious spellcaster hero, type 'shaman'.\nif(hero && !this.builtHero) {\n this.builtHero = this.build(hero);\n return;\n}\n\n// Munchkins are weak melee units with 1.25s build cooldown.\n// Throwers are fragile, deadly ranged units with 2.5s build cooldown.\nvar buildOrder = ['munchkin', 'thrower', 'munchkin', 'thrower', 'munchkin', 'thrower'];\nvar type = buildOrder[this.built.length % buildOrder.length];\n//this.say('Unit #' + this.built.length + ' will be a ' + type);\nthis.build(type);\n//this.say(\"Move\", {to:{x:20, y:30}});{x: 68, y: 29}{x: 70, y: 30}"
+ },
+ "programmable-shaman": {
+ "chooseAction": "if (this.hero !== undefined) {\n this.hero = this.getNearest(enemy);\n}\n// Shamans are spellcasters with a weak magic attack\n// and three spells: 'shrink', 'grow', and 'poison-cloud'.\n// Shrink: target has 2/3 health, 1.5x speed for 5s.\n// Grow: target has double health, half speed for 5s.\n// Once per match, she can cast poison cloud, which does\n// 5 poison dps for 10s to enemies in a 10m radius.\nvar right = 0;\nif(right === 0){this.move({x: 70, y: 40});\n}\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\nif(this.canCast('shrink', enemy)) \n{\n this.castShrink(enemy);\n}\nelse\n{\n this.castGrow(friend);\n}\n\nvar enemiesinpoisonrange = 0;\nfor (var i = 0; i < enemies.lenght; ++i) {\n var enemi = enemies[i];\n if (this.distance(enemi) <= 10) {\n enemiesinpoisonrange++;\n }\n}\nif (enemiesinpoisonrange >= 7) {\n this.castPoisonCloud(enemy);\n}\n//if (this.distance(ogrebase) > 10) {\n// this.move({x: 70, y: 30});\n//}\n//this.say(\"Defend!\", {targetPos: {x: 45, y: 30}});\n\n//this.say(\"Defend!\", {targetPos: {x: 35, y: 30}});\n\n//this.say(\"Defend!\", {targetPos: {x: 25, y: 30}});\n\n//this.say(\"Attack!\", {to:{x:20, y:30}});\n\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(this.canCast('shrink', enemy)) this.castShrink(enemy);\n//if(this.canCast('grow', friend)) this.castGrow(friend);\n//if(this.canCast('poison-cloud', enemy)) this.castPoisonCloud(enemy);\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 45, y: 30}});\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 50, y: 40});"
+ },
+ "programmable-brawler": {
+ "chooseAction": "// The Brawler is a huge melee hero with mighty mass.\n// this.throw() hurls an enemy behind him.\n// this.jumpTo() leaps to a target within 20m every 10s.\n// this.stomp() knocks everyone away, once per match.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(!this.getCooldown('jump')) this.jumpTo(enemy.pos);\n//if(!this.getCooldown('stomp') && this.distance(enemy) < 10) this.stomp();\n//if(!this.getCooldown('throw')) this.throw(enemy);\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 60, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 50, y: 40});\n\n// You can store state on this across frames:\n//this.lastHealth = this.health;{x: 68, y: 29}{x: 70, y: 30}"
+ },
+ "programmable-librarian": {
+ "chooseAction": "var enemies = this.getEnemies();\nif (enemies.length === 0)\n return;\nvar enemy = this.getNearest(enemies);\nvar friends = this.getFriends();\nvar friend = this.getNearest(friends);\nvar archer = this.getFriends(type, \"archer\");\nvar soldier = this.getFriends(type, \"soldier\");\nvar hero = this.getFriends(type, \"hushbaum\");\nvar rand = Math.random();\nvar xmove;\nvar ymove;\nfor (var i = 0; i < enemies.length / 3; i += 1) {\n var e = enemies[i];\n var ehealth = Math.floor(e.health);\n if (this.canCast(\"haste\", friend)) {\n this.say(\"Godspeed \" + friend.id + \"!\");\n this.castHaste(friend);\n }\n if (this.canCast(\"haste\", this)) {\n this.say(\"I am Godspeed!\");\n this.castHaste(this);\n }\n if (this.canCast(\"slow\", e)) {\n this.say(\"Chill Out \" + e.id + \"!\");\n this.castSlow(e);\n }\n if (this.distance(e) < 45) {\n this.attack(e);\n this.say(\"Attacking \" + e.id + \" life is \" + ehealth + \".\");\n }\n if (this.health < this.maxHealth * 0.75) {\n if (this.pos.x > 20) {\n this.move({\n x: this.pos.x - 20,\n y: this.pos.y\n });\n } else {\n this.move({\n x: this.pos.x + 20,\n y: this.pos.y\n });\n }\n }\n if (this.canCast(\"regen\", this)) {\n this.castRegen(this);\n this.say(\"I won't die today bitch!\");\n }\n if (friend.health < friend.maxHealth * 0.5) {\n if (this.canCast(\"regen\", friend)) {\n this.say(\"You won't die today \" + friend.id + \".\");\n this.castRegen(friend);\n }\n }\n}\n;"
+ },
+ "programmable-tharin": {
+ "chooseAction": "// Tharin is a melee fighter with shield, warcry, and terrify skills.\n// this.shield() lets him take one-third damage while defending.\n// this.warcry() gives allies within 10m 30% haste for 5s, every 10s.\n// this.terrify() sends foes within 30m fleeing for 5s, once per match.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(!this.getCooldown('warcry')) this.warcry();\n//if(!this.getCooldown('terrify')) this.terrify();\n//this.shield();\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 30, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 40, y: 40});\n\n// You can store state on this across frames:\n//this.lastHealth = this.health;"
+ },
+ "human-base": {
+ "chooseAction": "// This is the code for your base. Decide which unit to build each frame.\n// Units you build will go into the this.built array.\n// Destroy the enemy base within 60 seconds!\n// Check out the Guide at the top for more info.\n\n// CHOOSE YOUR HERO! You can only build one hero.\nvar hero;\n//hero = 'tharin'; // A fierce knight with battlecry abilities.\nhero = 'hushbaum'; // A fiery spellcaster hero.\n\nif(hero && !this.builtHero) {\n this.builtHero = this.build(hero);\n return;\n}\n\n// Soldiers are hard-to-kill, low damage melee units with 2s build cooldown.\n// Archers are fragile but deadly ranged units with 2.5s build cooldown.\nvar buildOrder = ['soldier', 'soldier', 'archer', 'archer', 'soldier', 'soldier'];\nvar type = buildOrder[this.built.length % buildOrder.length];\nthis.say('Unit #' + this.built.length + ' will be a ' + type);\nthis.build(type);\n\n "
+ }
+ },
+ "teamSpells": {
+ "ogres": [
+ "programmable-brawler/chooseAction",
+ "programmable-shaman/chooseAction",
+ "ogre-base/chooseAction"
+ ],
+ "humans": [
+ "programmable-librarian/chooseAction",
+ "programmable-tharin/chooseAction",
+ "human-base/chooseAction"
+ ]
+ },
+ "levelID": "dungeon-arena",
+ "creator": "5338c38c4811eff221de2347",
+ "creatorName": "iC0DE"
+ },
+ {
+ "sessionID": "532a777c2042708b711a6c29",
+ "submitDate": "2014-03-20T05:45:54.691Z",
+ "team": "ogres",
+ "code": {
+ "ogre-base": {
+ "chooseAction": "// This is the code for your base. Decide which unit to build each frame.\n// Units you build will go into the this.built array.\n// Destroy the enemy base within 60 seconds!\n// Check out the Guide at the top for more info.\n\n// Choose your hero! You can only build one hero.\nvar hero;\n//hero = 'ironjaw'; // A leaping juggernaut hero, type 'brawler'.\nhero = 'yugargen'; // A devious spellcaster hero, type 'shaman'.\nif(hero && !this.builtHero) {\n this.builtHero = this.build(hero);\n return;\n}\n\n// Munchkins are weak melee units with 1.25s build cooldown.\n// Throwers are fragile, deadly ranged units with 2.5s build cooldown.\nvar buildOrder = ['munchkin', 'munchkin', 'munchkin', 'thrower'];\nvar type = buildOrder[this.built.length % buildOrder.length];\n//this.say('Unit #' + this.built.length + ' will be a ' + type);\nthis.build(type);"
+ },
+ "programmable-shaman": {
+ "chooseAction": "// Shamans are spellcasters with a weak magic attack\n// and three spells: 'shrink', 'grow', and 'poison-cloud'.\n// Shrink: target has 2/3 health, 1.5x speed for 5s.\n// Grow: target has double health, half speed for 5s.\n// Once per match, she can cast poison cloud, which does\n// 5 poison dps for 10s to enemies in a 10m radius.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) {\n return; // Chill if all enemies are dead.\n}\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\nif (enemies.length > 5) {\n if(this.canCast('poison-cloud', enemy)) {\n this.castPoisonCloud(enemy);\n return;\n }\n}\n\nif (friends.length > 4) {\n this.attack(enemy); \n}\nfor (var i = 0; i < friends.length; ++i) {\n if (friends[i].health < 0) {\n continue;\n }\n if(friends[i].type == \"thrower\" && this.canCast('shrink', friends[i])) {\n this.castShrink(friends[i]);\n return;\n } \n if(friends[i].type == \"munchkin\" && this.canCast('grow', friends[i])) {\n this.castGrow(friends[i]);\n return;\n } \n}\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(this.canCast('shrink', enemy)) this.castShrink(enemy);\n//if(this.canCast('grow', friend)) this.castGrow(friend);\n//if(this.canCast('poison-cloud', enemy)) this.castPoisonCloud(enemy);\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 60, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 50, y: 40});"
+ },
+ "programmable-brawler": {
+ "chooseAction": "// The Brawler is a huge melee hero with mighty mass.\n// this.throw() hurls an enemy behind him.\n// this.jumpTo() leaps to a target within 20m every 10s.\n// this.stomp() knocks everyone away, once per match.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(!this.getCooldown('jump')) this.jumpTo(enemy.pos);\n//if(!this.getCooldown('stomp') && this.distance(enemy) < 10) this.stomp();\n//if(!this.getCooldown('throw')) this.throw(enemy);\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 60, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 50, y: 40});\n\n// You can store state on this across frames:\n//this.lastHealth = this.health;"
+ },
+ "human-base": {
+ "chooseAction": "// This is the code for your base. Decide which unit to build each frame.\n// Units you build will go into the this.built array.\n// Destroy the enemy base within 60 seconds!\n// Check out the Guide at the top for more info.\n\n// CHOOSE YOUR HERO! You can only build one hero.\nvar hero;\nhero = 'tharin'; // A fierce knight with battlecry abilities.\n//hero = 'hushbaum'; // A fiery spellcaster hero.\n\nif(hero && !this.builtHero) {\n this.builtHero = this.build(hero);\n return;\n}\n\n// Soldiers are hard-to-kill, low damage melee units with 2s build cooldown.\n// Archers are fragile but deadly ranged units with 2.5s build cooldown.\nvar buildOrder = ['archer', 'archer', 'soldier', 'archer', 'soldier'];\nvar type = buildOrder[this.built.length % buildOrder.length];\n//this.say('Unit #' + this.built.length + ' will be a ' + type);\nthis.build(type);"
+ },
+ "programmable-tharin": {
+ "chooseAction": "this.findTypeInRange = function(units, type) {\n for (var i = 0; i < units.length; ++i) {\n var unit = units[i];\n if (unit.type === type && this.distance(unit) < 20)\n return unit;\n }\n return null;\n};\n\nthis.findType = function(units, type) {\n for (var i = 0; i < units.length; ++i) {\n var unit = units[i];\n if (unit.type === type)\n return unit;\n }\n return null;\n};\n\nthis.findHeroInRange = function(units, range) {\n for (var i = 0; i < units.length; ++i) {\n var unit = units[i];\n if ((unit.type === 'shaman' || unit.type === 'brawler') && this.distance(unit) < range)\n return unit;\n }\n return null;\n};\n\n// Tharin is a melee fighter with shield, warcry, and terrify skills.\n// this.shield() lets him take one-third damage while defending.\n// this.warcry() gives allies within 10m 30% haste for 5s, every 10s.\n// this.terrify() sends foes within 30m fleeing for 5s, once per match.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\n\n//Enemies\nvar enemyBase = this.findType(enemies, 'base');\nvar brawler = this.findTypeInRange(enemies, 'brawler');\nvar shaman = this.findTypeInRange(enemies, 'shaman');\n\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(!this.getCooldown('warcry')) this.warcry();\n//if(!this.getCooldown('terrify')) this.terrify();\n//this.shield();\n\nif((brawler || shaman) && !this.attackTime)\n{\n this.attackTime = true;\n if(brawler)\n this.say(\"Attack!\", {target: brawler});\n else if(shaman)\n this.say(\"Attack!\", {target: shaman});\n}\nelse if(this.health < 15 && this.getCooldown('terrify'))\n{\n this.terrify();\n}\nelse if(this.findHeroInRange(enemies, 30) && this.getCooldown('terrify'))\n{\n this.terrify();\n}\nelse if(this.health < 25)\n{\n this.shield();\n}\nelse if(brawler && this.distance(brawler) <=10)\n{\n this.attack(brawler);\n}\nelse\n{\n this.attack(enemy);\n}\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 30, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 40, y: 40});\n\n// You can store state on this across frames:\n//this.lastHealth = this.health;"
+ },
+ "programmable-librarian": {
+ "chooseAction": "// The Librarian is a spellcaster with a fireball attack\n// plus three useful spells: 'slow', 'regen', and 'haste'.\n// Slow makes a target move and attack at half speed for 5s.\n// Regen makes a target heal 10 hp/s for 10s.\n// Haste speeds up a target by 4x for 5s, once per match.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(this.canCast('slow', enemy)) this.castSlow(enemy);\n//if(this.canCast('regen', friend)) this.castRegen(friend);\n//if(this.canCast('haste', friend)) this.castHaste(friend);\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 30, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 50, y: 40});"
+ }
+ },
+ "teamSpells": {
+ "ogres": [
+ "programmable-brawler/chooseAction",
+ "programmable-shaman/chooseAction",
+ "ogre-base/chooseAction"
+ ],
+ "humans": [
+ "programmable-librarian/chooseAction",
+ "programmable-tharin/chooseAction",
+ "human-base/chooseAction"
+ ]
+ },
+ "levelID": "dungeon-arena",
+ "creator": "53291a80b112e7240f324667",
+ "creatorName": "Imbal Oceanrage"
+ }
+],
+ "taskID": "53415d71942d00aa43dbf3e9",
+ "receiptHandle": "cd50e44db7dbd4cc0bcce047aa822ba2fe3556cf"
+}
\ No newline at end of file
diff --git a/headless_client/worker_world.coffee b/headless_client/worker_world.coffee
new file mode 100644
index 000000000..e40317bfe
--- /dev/null
+++ b/headless_client/worker_world.coffee
@@ -0,0 +1,220 @@
+# function to use inside a webworker.
+# This function needs to run inside an environment that has a 'self'.
+# This specific worker is targeted towards the node.js headless_client environment.
+
+JASON = require 'jason'
+fs = require 'fs'
+GLOBAL.Aether = Aether = require 'aether'
+GLOBAL._ = _ = require 'lodash'
+
+betterConsole = () ->
+
+ self.logLimit = 200;
+ self.logsLogged = 0;
+
+ self.transferableSupported = () -> true
+
+ self.console = log: ->
+ if self.logsLogged++ is self.logLimit
+ self.postMessage
+ type: "console-log"
+ args: ["Log limit " + self.logLimit + " reached; shutting up."]
+ id: self.workerID
+
+ else if self.logsLogged < self.logLimit
+ args = [].slice.call(arguments)
+ i = 0
+
+ while i < args.length
+ args[i] = args[i].toString() if args[i].constructor.className is "Thang" or args[i].isComponent if args[i] and args[i].constructor
+ ++i
+ try
+ self.postMessage
+ type: "console-log"
+ args: args
+ id: self.workerID
+
+ catch error
+ self.postMessage
+ type: "console-log"
+ args: [
+ "Could not post log: " + args
+ error.toString()
+ error.stack
+ error.stackTrace
+ ]
+ id: self.workerID
+
+ # so that we don't crash when debugging statements happen
+ self.console.error = self.console.warn = self.console.info = self.console.debug = self.console.log
+ GLOBAL.console = console = self.console
+ self.console
+
+
+work = () ->
+ console.log "starting..."
+
+ console.log = ->
+
+ World = self.require('lib/world/world')
+ GoalManager = self.require('lib/world/GoalManager')
+
+ Aether.addGlobal('Vector', require('lib/world/vector'))
+ Aether.addGlobal('_', _)
+
+ self.cleanUp = ->
+ self.world = null
+ self.goalManager = null
+ self.postedErrors = {}
+ self.t0 = null
+ self.logsLogged = 0
+
+ self.runWorld = (args) ->
+ console.log "Running world inside worker."
+ self.postedErrors = {}
+ self.t0 = new Date()
+ self.postedErrors = false
+ self.logsLogged = 0
+
+ try
+ self.world = new World(args.userCodeMap)
+ self.world.levelSessionIDs = args.levelSessionIDs
+ self.world.loadFromLevel args.level, true if args.level
+ self.world.headless = args.headless
+ self.goalManager = new GoalManager(self.world)
+ self.goalManager.setGoals args.goals
+ self.goalManager.setCode args.userCodeMap
+ self.goalManager.worldGenerationWillBegin()
+ self.world.setGoalManager self.goalManager
+ catch error
+ console.log "There has been an error inside the worker."
+ self.onWorldError error
+ return
+ Math.random = self.world.rand.randf # so user code is predictable
+ console.log "Loading frames."
+
+ self.postMessage type: "start-load-frames"
+
+
+ self.world.loadFrames self.onWorldLoaded, self.onWorldError, self.onWorldLoadProgress, true
+
+
+ self.onWorldLoaded = onWorldLoaded = ->
+ self.goalManager.worldGenerationEnded()
+ goalStates = self.goalManager.getGoalStates()
+ self.postMessage type: "end-load-frames", goalStates: goalStates
+
+ t1 = new Date()
+ diff = t1 - self.t0
+ if (self.world.headless)
+ return console.log("Headless simulation completed in #{diff}ms.");
+
+ transferableSupported = self.transferableSupported()
+ try
+ serialized = serializedWorld: self.world.serialize()
+ transferableSupported = false
+ catch error
+ console.log "World serialization error:", error.toString() + "\n" + error.stack or error.stackTrace
+ t2 = new Date()
+
+ # console.log("About to transfer", serialized.serializedWorld.trackedPropertiesPerThangValues, serialized.transferableObjects);
+ try
+ message =
+ type: "new-world"
+ serialized: serialized.serializedWorld
+ goalStates: goalStates
+ if transferableSupported
+ self.postMessage message, serialized.transferableObjects
+ else
+ self.postMessage message
+
+ catch error
+ console.log "World delivery error:", error.toString() + "\n" + error.stack or error.stackTrace
+ t3 = new Date()
+ console.log "And it was so: (" + (diff / self.world.totalFrames).toFixed(3) + "ms per frame,", self.world.totalFrames, "frames)\nSimulation :", diff + "ms \nSerialization:", (t2 - t1) + "ms\nDelivery :", (t3 - t2) + "ms"
+ self.cleanUp()
+
+
+ self.onWorldError = onWorldError = (error) ->
+ self.postMessage type: "end-load-frames"
+ if error instanceof Aether.problems.UserCodeProblem
+ #console.log "Aether userCodeProblem occured."
+ unless self.postedErrors[error.key]
+ problem = error.serialize()
+ self.postMessage
+ type: "user-code-problem"
+ problem: problem
+
+ self.postedErrors[error.key] = problem
+ else
+ console.log "Non-UserCodeError:", error.toString() + "\n" + error.stack or error.stackTrace
+ self.cleanUp()
+
+ self.onWorldLoadProgress = onWorldLoadProgress = (progress) ->
+ #console.log "Worker onWorldLoadProgress"
+ self.postMessage
+ type: "world-load-progress-changed"
+ progress: progress
+
+ self.abort = abort = ->
+ #console.log "Abort called for worker."
+ if self.world
+ #console.log "About to abort:", self.world.name, typeof self.world.abort
+ self.world.abort()
+ self.world = null
+ self.postMessage type: "abort"
+ self.cleanUp()
+
+ self.reportIn = reportIn = ->
+ console.log "Reporting in."
+ self.postMessage type: "report-in"
+
+ self.addEventListener "message", (event) ->
+ #console.log JSON.stringify event
+ self[event.data.func] event.data.args
+
+ self.postMessage type: "worker-initialized"
+
+worldCode = fs.readFileSync "./public/javascripts/world.js", 'utf8'
+lodashCode = fs.readFileSync "./public/javascripts/lodash.js", 'utf8'
+aetherCode = fs.readFileSync "./public/javascripts/aether.js", 'utf8'
+
+#window.BOX2D_ENABLED = true;
+
+newConsole = "newConsole = #{}JASON.stringify newConsole}()";
+
+ret = """
+
+ GLOBAL = root = window = self;
+ GLOBAL.window = window;
+
+ self.workerID = "Worker";
+
+ console = #{JASON.stringify betterConsole}();
+
+ try {
+ // the world javascript file
+ #{worldCode};
+ #{lodashCode};
+ #{aetherCode};
+
+ // Don't let user generated code access stuff from our file system!
+ self.importScripts = importScripts = null;
+ self.native_fs_ = native_fs_ = null;
+
+ // the actual function
+ #{JASON.stringify work}();
+ }catch (error) {
+ self.postMessage({"type": "console-log", args: ["An unhandled error occured: ", error.toString(), error.stack], id: -1});
+ }
+"""
+
+
+#console = #{JASON.stringify createConsole}();
+#
+# console.error = console.info = console.log;
+#self.console = console;
+#GLOBAL.console = console;
+
+
+module.exports = new Function(ret)
diff --git a/package.json b/package.json
index 665ac0131..3986248e1 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,8 @@
"mongoose": "3.8.x",
"mongoose-text-search": "~0.0.2",
"request": "2.12.x",
- "tv4": "1.0.11",
- "lodash": "~2.0.0",
+ "tv4": "~1.0.16",
+ "lodash": "~2.4.1",
"underscore.string": "2.3.x",
"async": "0.2.x",
"connect": "2.7.x",
@@ -60,9 +60,14 @@
"gridfs-stream": "0.4.x",
"stream-buffers": "0.2.x",
"sendwithus": "2.0.x",
- "aws-sdk":"~2.0.0",
- "bayesian-battle":"0.0.x",
- "redis": ""
+ "aws-sdk": "~2.0.0",
+ "bayesian-battle": "0.0.x",
+ "redis": "",
+ "webworker-threads": "~0.4.11",
+ "node-gyp": "~0.13.0",
+ "aether": "~0.2.8",
+ "JASON": "~0.1.3",
+ "JQDeferred": "~2.1.0"
},
"devDependencies": {
"jade": "0.33.x",
@@ -73,7 +78,6 @@
"css-brunch": "> 1.0 < 1.8",
"jade-brunch": "> 1.0 < 1.8",
"uglify-js-brunch": "~1.7.4",
- "clean-css-brunch": "> 1.0 < 1.8",
"auto-reload-brunch": "> 1.0 < 1.8",
"brunch": "~1.7.4",
"jasmine-node": "1.13.x",
@@ -92,7 +96,9 @@
"karma-requirejs": "~0.2.1",
"karma-phantomjs-launcher": "~0.1.1",
"karma": "~0.10.9",
- "karma-coverage": "~0.1.4"
+ "karma-coverage": "~0.1.4",
+ "compressible": "~1.0.1",
+ "jasmine-spec-reporter": "~0.3.0"
},
"license": "MIT for the code, and CC-BY for the art and music",
"private": true,
diff --git a/scripts/devSetup/directoryController.py b/scripts/devSetup/directoryController.py
index 6585ff5f8..5087db888 100644
--- a/scripts/devSetup/directoryController.py
+++ b/scripts/devSetup/directoryController.py
@@ -20,23 +20,30 @@ class DirectoryController(object):
def bin_directory(self):
return self.root_install_directory
+ def mkdir(self, path):
+ if os.path.exists(path):
+ print(u"Skipping creation of " + path + " because it exists.")
+ else:
+ os.mkdir(path)
+
def create_directory_in_tmp(self,subdirectory):
- os.mkdir(self.generate_path_for_directory_in_tmp(subdirectory))
+ path = self.generate_path_for_directory_in_tmp(subdirectory)
+ self.mkdir(path)
def generate_path_for_directory_in_tmp(self,subdirectory):
return self.tmp_directory + os.sep + subdirectory
def create_directory_in_bin(self,subdirectory):
full_path = self.bin_directory + os.sep + subdirectory
- os.mkdir(full_path)
+ self.mkdir(full_path)
def create_base_directories(self):
shutil.rmtree(self.root_dir + os.sep + "coco" + os.sep + "node_modules",ignore_errors=True) #just in case
try:
- if os.path.exists(self.tmp_directory):
- self.remove_tmp_directory()
- os.mkdir(self.tmp_directory)
+ if os.path.exists(self.tmp_directory):
+ self.remove_tmp_directory()
+ os.mkdir(self.tmp_directory)
except:
- raise errors.CoCoError(u"There was an error creating the directory structure, do you have correct permissions? Please remove all and start over.")
+ raise errors.CoCoError(u"There was an error creating the directory structure, do you have correct permissions? Please remove all and start over.")
def remove_directories(self):
shutil.rmtree(self.bin_directory + os.sep + "node",ignore_errors=True)
diff --git a/scripts/devSetup/factories.py b/scripts/devSetup/factories.py
index f14f922ec..1eab847bb 100644
--- a/scripts/devSetup/factories.py
+++ b/scripts/devSetup/factories.py
@@ -37,10 +37,12 @@ class SetupFactory(object):
try:
mongo_version_string = subprocess.check_output("mongod --version",shell=True)
mongo_version_string = mongo_version_string.decode(encoding='UTF-8')
- except:
- print("Mongod not found.")
+ except Exception as e:
+ print("Mongod not found: %s"%e)
if "v2.6." not in mongo_version_string:
- print("MongoDB not found, so installing...")
+ if mongo_version_string:
+ print("Had MongoDB version: %s"%mongo_version_string)
+ print("MongoDB not found, so installing a local copy...")
self.mongo.download_dependencies()
self.mongo.install_dependencies()
self.node.download_dependencies()
diff --git a/scripts/devSetup/mongo.py b/scripts/devSetup/mongo.py
index 88de736af..eb57ea452 100644
--- a/scripts/devSetup/mongo.py
+++ b/scripts/devSetup/mongo.py
@@ -8,7 +8,7 @@ import os
from configuration import Configuration
from dependency import Dependency
import sys
-
+import shutil
class MongoDB(Dependency):
def __init__(self,configuration):
@@ -32,13 +32,20 @@ class MongoDB(Dependency):
def bashrc_string(self):
return "COCO_MONGOD_PATH=" + self.config.directory.bin_directory + os.sep + u"mongo" + os.sep +"bin" + os.sep + "mongod"
+
def download_dependencies(self):
- self.downloader.download()
- self.downloader.decompress()
+ install_directory = self.config.directory.bin_directory + os.sep + u"mongo"
+ if os.path.exists(install_directory):
+ print(u"Skipping MongoDB download because " + install_directory + " exists.")
+ else:
+ self.downloader.download()
+ self.downloader.decompress()
def install_dependencies(self):
install_directory = self.config.directory.bin_directory + os.sep + u"mongo"
- import shutil
- shutil.copytree(self.findUnzippedMongoBinPath(),install_directory)
+ if os.path.exists(install_directory):
+ print(u"Skipping creation of " + install_directory + " because it exists.")
+ else:
+ shutil.copytree(self.findUnzippedMongoBinPath(),install_directory)
def findUnzippedMongoBinPath(self):
return self.downloader.download_directory + os.sep + \
diff --git a/scripts/devSetup/node.py b/scripts/devSetup/node.py
index 065634aad..8fb1265d8 100644
--- a/scripts/devSetup/node.py
+++ b/scripts/devSetup/node.py
@@ -37,19 +37,27 @@ class Node(Dependency):
return self.config.directory.bin_directory
def download_dependencies(self):
- self.downloader.download()
- self.downloader.decompress()
+ install_directory = self.config.directory.bin_directory + os.sep + u"node"
+ if os.path.exists(install_directory):
+ print(u"Skipping Node download because " + install_directory + " exists.")
+ else:
+ self.downloader.download()
+ self.downloader.decompress()
def bashrc_string(self):
return "COCO_NODE_PATH=" + self.config.directory.bin_directory + os.sep + u"node" + os.sep + "bin" + os.sep +"node"
def install_dependencies(self):
install_directory = self.config.directory.bin_directory + os.sep + u"node"
#check for node here
- unzipped_node_path = self.findUnzippedNodePath()
if self.config.system.operating_system in ["mac","linux"] and not which("node"):
+ unzipped_node_path = self.findUnzippedNodePath()
print("Copying node into /usr/local/bin/...")
shutil.copy(unzipped_node_path + os.sep + "bin" + os.sep + "node","/usr/local/bin/")
os.chmod("/usr/local/bin/node",S_IRWXG|S_IRWXO|S_IRWXU)
- shutil.copytree(self.findUnzippedNodePath(),install_directory)
+ if os.path.exists(install_directory):
+ print(u"Skipping creation of " + install_directory + " because it exists.")
+ else:
+ unzipped_node_path = self.findUnzippedNodePath()
+ shutil.copytree(self.findUnzippedNodePath(),install_directory)
wants_to_upgrade = True
if self.check_if_executable_installed(u"npm"):
warning_string = u"A previous version of npm has been found. \nYou may experience problems if you have a version of npm that's too old.Would you like to upgrade?(y/n) "
diff --git a/scripts/mail.coffee b/scripts/mail.coffee
new file mode 100644
index 000000000..b9983b619
--- /dev/null
+++ b/scripts/mail.coffee
@@ -0,0 +1,104 @@
+do (setupLodash = this) ->
+ GLOBAL._ = require 'lodash'
+ _.str = require 'underscore.string'
+ _.mixin _.str.exports()
+
+async = require 'async'
+
+serverSetup = require '../server_setup'
+sendwithus = require '../server/sendwithus'
+User = require '../server/users/User.coffee'
+Level = require '../server/levels/Level.coffee'
+LevelSession = require '../server/levels/sessions/LevelSession.coffee'
+
+alreadyEmailed = []
+
+DEBUGGING = true
+
+sendInitialRecruitingEmail = ->
+ leaderboards = [
+ {slug: 'brawlwood', team: 'humans', limit: 55, name: "Brawlwood", original: "52d97ecd32362bc86e004e87", majorVersion: 0}
+ {slug: 'brawlwood', team: 'ogres', limit: 40, name: "Brawlwood", original: "52d97ecd32362bc86e004e87", majorVersion: 0}
+ {slug: 'dungeon-arena', team: 'humans', limit: 200, name: "Dungeon Arena", original: "53173f76c269d400000543c2", majorVersion: 0}
+ {slug: 'dungeon-arena', team: 'ogres', limit: 150, name: "Dungeon Arena", original: "53173f76c269d400000543c2", majorVersion: 0}
+ ]
+ async.waterfall [
+ (callback) -> async.map leaderboards, grabSessions, callback
+ (sessionLists, callback) -> async.map collapseSessions(sessionLists), grabUser, callback
+ (users, callback) -> async.map users, emailUser, callback
+ ], (err, results) ->
+ return console.log "Error:", err if err
+ console.log "Looked at sending to #{results.length} users; sent to #{_.filter(results).length}."
+ console.log "Sent to: ['#{(user.email for user in results when user).join('\', \'')}']"
+
+grabSessions = (levelInfo, callback) ->
+ queryParameters =
+ level: {original: levelInfo.original, majorVersion: levelInfo.majorVersion}
+ team: levelInfo.team
+ submitted: true
+ sortParameters = totalScore: -1
+ selectString = 'totalScore creator'
+ query = LevelSession
+ .find(queryParameters)
+ .limit(levelInfo.limit)
+ .sort(sortParameters)
+ .select(selectString)
+ .lean()
+ query.exec (err, sessions) ->
+ return callback err if err
+ for session, rank in sessions
+ session.levelInfo = levelInfo
+ session.rank = rank + 1
+ callback null, sessions
+
+collapseSessions = (sessionLists) ->
+ userRanks = {}
+ for sessionList in sessionLists
+ for session in sessionList
+ ranks = userRanks[session.creator] ? []
+ ranks.push session
+ userRanks[session.creator] = _.sortBy ranks, 'rank'
+ topSessions = []
+ for userID, ranks of userRanks
+ topSessions.push ranks[0]
+ topSessions
+
+grabUser = (session, callback) ->
+ findParameters = _id: session.creator
+ selectString = 'email emailSubscriptions emails name jobProfile'
+ query = User
+ .findOne(findParameters)
+ .select(selectString)
+ .lean()
+ query.exec (err, user) ->
+ return callback err if err
+ user.session = session
+ callback null, user
+
+totalEmailsSent = 0
+emailUser = (user, callback) ->
+ #return callback null, false if user.emails?.anyNotes?.enabled is false # TODO: later, uncomment to obey also "anyNotes" when that's untangled
+ return callback null, false if user.emails?.recruitNotes?.enabled is false
+ return callback null, false if user.email in alreadyEmailed
+ return callback null, false if DEBUGGING and (totalEmailsSent > 1 or Math.random() > 0.1)
+ ++totalEmailsSent
+ name = if user.firstName and user.lastName then "#{user.firstName}" else user.name
+ name = "Wizard" if not name or name is "Anoner"
+ team = user.session.levelInfo.team
+ team = team.substr(0, team.length - 1)
+ context =
+ email_id: sendwithus.templates.one_time_recruiting_email
+ recipient:
+ address: if DEBUGGING then 'nick@codecombat.com' else user.email
+ name: name
+ email_data:
+ name: name
+ level_name: user.session.levelInfo.name
+ place: "##{user.session.rank}" # like "#31"
+ level_race: team
+ sendwithus.api.send context, (err, result) ->
+ return callback err if err
+ callback null, user
+
+serverSetup.connectToDatabase()
+sendInitialRecruitingEmail()
diff --git a/scripts/mongodb/migrations/2014-04-22-migrate-emails.js b/scripts/mongodb/migrations/2014-04-22-migrate-emails.js
new file mode 100644
index 000000000..07ccd32ad
--- /dev/null
+++ b/scripts/mongodb/migrations/2014-04-22-migrate-emails.js
@@ -0,0 +1,35 @@
+// Did not migrate anonymous users because they get their properties setup on signup.
+
+// migrate the most common subscription configs with mass update commands
+db.users.update({anonymous:false, emailSubscriptions:['announcement', 'notification'], emails:{$exists:false}}, {$set:{emails:{}}}, {multi:true});
+db.users.update({anonymous:false, emailSubscriptions:[], emails:{$exists:false}}, {$set:{emails:{anyNotes:{enabled:false}, generalNews:{enabled:false}}}}, {multi:true});
+
+// migrate the rest one by one
+emailMap = {
+ announcement: 'generalNews',
+ developer: 'archmageNews',
+ tester: 'adventurerNews',
+ level_creator: 'artisanNews',
+ article_editor: 'scribeNews',
+ translator: 'diplomatNews',
+ support: 'ambassadorNews',
+ notification: 'anyNotes'
+};
+
+db.users.find({anonymous:false, emails:{$exists:false}}).forEach(function(u) {
+ emails = {anyNotes:{enabled:false}, generalNews:{enabled:false}};
+ var oldEmailSubs = u.emailSubscriptions || ['notification', 'announcement'];
+ for(var email in oldEmailSubs) {
+ var oldEmailName = oldEmailSubs[email];
+ var newEmailName = emailMap[oldEmailName];
+ if(!newEmailName) {
+ print('STOP, COULD NOT FIND EMAIL NAME', oldEmailName);
+ return false;
+ }
+ emails[newEmailName] = {enabled:true};
+ }
+ u.emails = emails;
+ db.users.save(u);
+});
+
+// Done. No STOP error when this was run.
\ No newline at end of file
diff --git a/scripts/mongodb/migrations/2014-05-08-populate-watchers.js b/scripts/mongodb/migrations/2014-05-08-populate-watchers.js
new file mode 100644
index 000000000..b6a56b475
--- /dev/null
+++ b/scripts/mongodb/migrations/2014-05-08-populate-watchers.js
@@ -0,0 +1,70 @@
+var scott = ObjectId('5162fab9c92b4c751e000274');
+var nick = ObjectId('512ef4805a67a8c507000001');
+//var collections = [db.levels, db.level.components, db.level.systems];
+var collection = db.levels;
+//var collection = db.level.components;
+//var collection = db.level.systems;
+var permission;
+
+collection.find({slug:{$exists:1}}).forEach(function(doc) {
+ print('--------------------------------------------------', doc.name);
+ var official = false;
+ var owner = null;
+ var changed = false;
+ for (var j in doc.permissions) {
+ permission = doc.permissions[j];
+ if(permission.access !== 'owner')
+ continue;
+ owner = permission.target;
+ if(owner === scott+'') {
+ print('Owner of', doc.name, 'is Scott');
+ official = true;
+ }
+ else if(owner === nick+'') {
+ print('Owner of', doc.name, 'is Nick');
+ official = true;
+ }
+ else {
+ print('Owner of', doc.name, 'is', owner);
+ }
+ }
+ if(!doc.watchers) {
+ print('Init watchers, was', doc.watchers);
+ doc.watchers = [];
+ }
+ if(official) {
+ var hasNick = false;
+ var hasScott = false;
+ for(var k in doc.watchers) {
+ var watcher = doc.watchers[k];
+ if(watcher.equals(nick)) hasNick = true;
+ if(watcher.equals(scott)) hasScott = true;
+ }
+ if(!hasNick) {
+ doc.watchers.push(nick);
+ print('Added Nick to', doc.name);
+ changed = true;
+ }
+ if(!hasScott) {
+ doc.watchers.push(scott);
+ print('Added Scott to', doc.name);
+ changed = true;
+ }
+ }
+ else {
+ var hasOwner = false;
+ for(var l in doc.watchers) {
+ var watcher = doc.watchers[l];
+ if(watcher+'' === owner) hasOwner = true;
+ }
+ if(!hasOwner) {
+ doc.watchers.push(ObjectId(owner));
+ print('Added owner to', doc.name);
+ changed = true;
+ }
+ }
+ if(changed) {
+ print('Changed, so saving');
+ collection.save(doc);
+ }
+});
\ No newline at end of file
diff --git a/scripts/mongodb/queries/patches.js b/scripts/mongodb/queries/patches.js
new file mode 100644
index 000000000..418ebbe18
--- /dev/null
+++ b/scripts/mongodb/queries/patches.js
@@ -0,0 +1,13 @@
+// Finds all patches and denorms their target names and creators.
+
+var patches = db.patches.find({status:'pending'}).toArray();
+for(var i in patches) {
+ var patch = patches[i];
+ var collection = null;
+ if(patch.target.collection === 'level') collection = db.levels;
+ if(patch.target.collection === 'level_component') collection = db.level.components;
+ if(patch.target.collection === 'level_system') collection = db.level.systems;
+ var target = collection.findOne({original:patch.target.original, name:{$exists:true}});
+ var creator = db.users.findOne({_id:patch.creator});
+ print(target.name, 'made by', creator.name);
+ }
\ No newline at end of file
diff --git a/scripts/simulate.coffee b/scripts/simulate.coffee
new file mode 100644
index 000000000..01eccb5f9
--- /dev/null
+++ b/scripts/simulate.coffee
@@ -0,0 +1,23 @@
+spawn = require("child_process").spawn
+
+[sessionOne, sessionTwo] = [process.argv[2],process.argv[3]]
+homeDirectory = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE
+unless sessionOne and sessionTwo and sessionOne.length is 24 and sessionTwo.length is 24
+ console.log "Not enough games to continue!"
+ process.exit(1)
+run = (cb) ->
+ command = spawn("coffee",["headless_client.coffee","one-game",sessionOne,sessionTwo],{cwd: homeDirectory + "/codecombat/"})
+ result = ""
+ command.stdout.on 'data', (data) ->
+ result += data.toString()
+ command.stdout.on 'close', ->
+ return cb(result)
+run (result) ->
+ lines = result.split("\n")
+ for line in lines
+ if line.slice(0, 10) is "GAMERESULT"
+ process.stdout.write line.slice(11)
+ process.exit(0)
+ process.exit(0)
+
+
\ No newline at end of file
diff --git a/scripts/transpile.coffee b/scripts/transpile.coffee
new file mode 100644
index 000000000..0cb4b462f
--- /dev/null
+++ b/scripts/transpile.coffee
@@ -0,0 +1,81 @@
+do (setupLodash = this) ->
+ GLOBAL._ = require 'lodash'
+ _.str = require 'underscore.string'
+ _.mixin _.str.exports()
+Aether = require "aether"
+async = require 'async'
+
+serverSetup = require '../server_setup'
+Level = require '../server/levels/Level.coffee'
+LevelSession = require '../server/levels/sessions/LevelSession.coffee'
+
+Aether.addGlobal 'Vector', require '../app/lib/world/vector'
+Aether.addGlobal '_', _
+
+transpileLevelSession = (sessionID, cb) ->
+ query = LevelSession.findOne("_id": sessionID).select("submittedCode").lean()
+ query.exec (err, session) ->
+ if err then return cb err
+ submittedCode = session.submittedCode
+ transpiledCode = {}
+ console.log "Updating session #{sessionID}"
+ for thang, spells of submittedCode
+ transpiledCode[thang] = {}
+ for spellID, spell of spells
+
+ aetherOptions =
+ problems: {}
+ language: "javascript"
+ functionName: spellID
+ functionParameters: []
+ yieldConditionally: spellID is "plan"
+ globals: ['Vector', '_']
+ protectAPI: true
+ includeFlow: false
+ if spellID is "hear" then aetherOptions["functionParameters"] = ["speaker","message","data"]
+
+ aether = new Aether aetherOptions
+ transpiledCode[thang][spellID] = aether.transpile spell
+ conditions =
+ "_id": sessionID
+ update =
+ "transpiledCode": transpiledCode
+ "submittedCodeLanguage": "javascript"
+ query = LevelSession.update(conditions,update)
+
+ query.exec (err, numUpdated) -> cb err
+
+findLadderLevelSessions = (levelID, cb) ->
+ queryParameters =
+ "level.original": levelID + ""
+ submitted: true
+
+ selectString = "_id"
+ query = LevelSession.find(queryParameters).select(selectString).lean()
+
+ query.exec (err, levelSessions) ->
+ if err then return cb err
+ levelSessionIDs = _.pluck levelSessions, "_id"
+ async.eachSeries levelSessionIDs, transpileLevelSession, (err) ->
+ if err then return cb err
+ cb null
+
+
+transpileLadderSessions = ->
+ queryParameters =
+ type: "ladder"
+ "version.isLatestMajor": true
+ "version.isLatestMinor": true
+ selectString = "original"
+ query = Level.find(queryParameters).select(selectString).lean()
+
+ query.exec (err, ladderLevels) ->
+ throw err if err
+ ladderLevels = _.pluck ladderLevels, "original"
+ async.eachSeries ladderLevels, findLadderLevelSessions, (err) ->
+ throw err if err
+
+serverSetup.connectToDatabase()
+transpileLadderSessions()
+
+
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/config.coco b/scripts/windows/coco-dev-setup/batch/config/config.coco
index eba46b0f4..da381689f 100755
--- a/scripts/windows/coco-dev-setup/batch/config/config.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/config.coco
@@ -1,8 +1,9 @@
- 1.2
+ 3.5
GlenDC
CodeCombat.com © 2013-2014
https://github.com/codecombat/codecombat.git
git@github.com:codecombat/codecombat.git
+ http://23.21.59.137/dump.tar.gz
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/downloads.coco b/scripts/windows/coco-dev-setup/batch/config/downloads.coco
index 771189954..f8906cbb4 100755
--- a/scripts/windows/coco-dev-setup/batch/config/downloads.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/downloads.coco
@@ -11,7 +11,6 @@
http://nodejs.org/dist/v0.10.25/x64/node-v0.10.25-x64.msi
http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p353-x64.exe?direct
http://s3.amazonaws.com/CodeCombatLargeFiles/python-64.msi
- http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe
http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe
@@ -19,20 +18,28 @@
http://download.microsoft.com/download/C/6/D/C6D0FD4E-9E53-4897-9B91-836EBA2AACD3/vcredist_x86.exe
-
+
- http://fastdl.mongodb.org/win32/mongodb-win32-i386-2.5.4.zip
+ https://fastdl.mongodb.org/win32/mongodb-win32-i386-2.6.0.zip
- http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-2.5.4.zip
+ https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-2.6.0.zip
+
+
+
+
+ https://fastdl.mongodb.org/win32/mongodb-win32-i386-2.6.0.zip
+
+
+ https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-2.6.0.zip
- http://fastdl.mongodb.org/win32/mongodb-win32-i386-2.5.4.zip
+ https://fastdl.mongodb.org/win32/mongodb-win32-i386-2.6.0.zip
- http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2.5.4.zip
+ https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2.6.0.zip
-
\ No newline at end of file
+
diff --git a/scripts/windows/coco-dev-setup/batch/config/finished_header.coco b/scripts/windows/coco-dev-setup/batch/config/finished_header.coco
old mode 100755
new mode 100644
index 3e8f64b02..9163183ca
--- a/scripts/windows/coco-dev-setup/batch/config/finished_header.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/finished_header.coco
@@ -1,7 +1,7 @@
- ______ _____ _ _ _____ _____ _ _ ___________
- | ___|_ _| \ | |_ _/ ___| | | || ___| _ \
- | |_ | | | \| | | | \ `--.| |_| || |__ | | | |
- | _| | | | . ` | | | `--. \ _ || __|| | | |
- | | _| |_| |\ |_| |_/\__/ / | | || |___| |/ /
- \_| \___/\_| \_/\___/\____/\_| |_/\____/|___/
+ ______ _____ _ _ _____ _____ _ _ ___________
+ | ___|_ _| \ | |_ _/ ___| | | || ___| _ \
+ | |_ | | | \| | | | \ `--.| |_| || |__ | | | |
+ | _| | | | . ` | | | `--. \ _ || __|| | | |
+ | | _| |_| |\ |_| |_/\__/ / | | || |___| |/ /
+ \_| \___/\_| \_/\___/\____/\_| |_/\____/|___/
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/github_header.coco b/scripts/windows/coco-dev-setup/batch/config/github_header.coco
old mode 100755
new mode 100644
index dd979561d..ce71943fc
--- a/scripts/windows/coco-dev-setup/batch/config/github_header.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/github_header.coco
@@ -1,7 +1,7 @@
- _____ _____ _____ _ _ _ _______
- | __ \_ _|_ _| | | | | | | ___ \
- | | \/ | | | | | |_| | | | | |_/ /
- | | __ | | | | | _ | | | | ___ \
- | |_\ \_| |_ | | | | | | |_| | |_/ /
- \____/\___/ \_/ \_| |_/\___/\____/
+ _____ _____ _____ _ _ _ _______
+ | __ \_ _|_ _| | | | | | | ___ \
+ | | \/ | | | | | |_| | | | | |_/ /
+ | | __ | | | | | _ | | | | ___ \
+ | |_\ \_| |_ | | | | | | |_| | |_/ /
+ \____/\___/ \_/ \_| |_/\___/\____/
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/install_header.coco b/scripts/windows/coco-dev-setup/batch/config/install_header.coco
old mode 100755
new mode 100644
index a804e1db3..e99e50e70
--- a/scripts/windows/coco-dev-setup/batch/config/install_header.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/install_header.coco
@@ -1,7 +1,7 @@
- _____ ___________ _____ _ _ ___ ______ _____
- / ___|| _ | ___|_ _| | | |/ _ \ | ___ \ ___|
- \ `--. | | | | |_ | | | | | / /_\ \| |_/ / |__
- `--. \| | | | _| | | | |/\| | _ || /| __|
- /\__/ /\ \_/ / | | | \ /\ / | | || |\ \| |___
- \____/ \___/\_| \_/ \/ \/\_| |_/\_| \_\____/
+ _____ ___________ _____ _ _ ___ ______ _____
+ / ___|| _ | ___|_ _| | | |/ _ \ | ___ \ ___|
+ \ `--. | | | | |_ | | | | | / /_\ \| |_/ / |__
+ `--. \| | | | _| | | | |/\| | _ || /| __|
+ /\__/ /\ \_/ / | | | \ /\ / | | || |\ \| |___
+ \____/ \___/\_| \_/ \/ \/\_| |_/\_| \_\____/
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/license.coco b/scripts/windows/coco-dev-setup/batch/config/localized/license-nl.coco
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/config/license.coco
rename to scripts/windows/coco-dev-setup/batch/config/localized/license-nl.coco
diff --git a/scripts/windows/coco-dev-setup/batch/config/localized/license-ru.coco b/scripts/windows/coco-dev-setup/batch/config/localized/license-ru.coco
new file mode 100644
index 000000000..48ad97ea1
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/localized/license-ru.coco
@@ -0,0 +1,10 @@
+
+‹¨æ¥§¨ï MIT (Œ’ˆ)
+
+Copyright (c) 2014 CodeCombat Inc. ¨ ¤à㣨¥ ãç á⨪¨
+
+„ ï «¨æ¥§¨ï à §à¥è ¥â «¨æ ¬, ¯®«ã稢訬 ª®¯¨î ¤ ®£® ¯à®£à ¬¬®£® ®¡¥á¯¥ç¥¨ï ¨ ᮯãâáâ¢ãî饩 ¤®ªã¬¥â 樨 (¢ ¤ «ì¥©è¥¬ ¨¬¥ã¥¬ë¬¨ <à®£à ¬¬®¥ Ž¡¥á¯¥ç¥¨¥>), ¡¥§¢®§¬¥§¤® ¨á¯®«ì§®¢ âì à®£à ¬¬®¥ Ž¡¥á¯¥ç¥¨¥ ¡¥§ ®£à ¨ç¥¨©, ¢ª«îç ï ¥®£à ¨ç¥®¥ ¯à ¢® ¨á¯®«ì§®¢ ¨¥, ª®¯¨à®¢ ¨¥, ¨§¬¥¥¨¥, ¤®¡ ¢«¥¨¥, ¯ã¡«¨ª æ¨î, à á¯à®áâà ¥¨¥, áã¡«¨æ¥§¨à®¢ ¨¥ ¨/¨«¨ ¯à®¤ ¦ã ª®¯¨© à®£à ¬¬®£® Ž¡¥á¯¥ç¥¨ï, â ª¦¥ ª ª ¨ «¨æ ¬, ª®â®àë¬ ¯à¥¤®áâ ¢«ï¥âáï ¤ ®¥ à®£à ¬¬®¥ Ž¡¥á¯¥ç¥¨¥, ¯à¨ ᮡ«î¤¥¨¨ á«¥¤ãîé¨å ãá«®¢¨©:
+
+“ª § ®¥ ¢ëè¥ ã¢¥¤®¬«¥¨¥ ®¡ ¢â®à᪮¬ ¯à ¢¥ ¨ ¤ ë¥ ãá«®¢¨ï ¤®«¦ë ¡ëâì ¢ª«îç¥ë ¢® ¢á¥ ª®¯¨¨ ¨«¨ § ç¨¬ë¥ ç á⨠¤ ®£® à®£à ¬¬®£® Ž¡¥á¯¥ç¥¨ï.
+
+„€Ž… Žƒ€ŒŒŽ… Ž…‘…—…ˆ… …„Ž‘’€‚‹Ÿ…’‘Ÿ <Š€Š …‘’œ>, …‡ Š€Šˆ•-‹ˆŽ ƒ€€’ˆ‰, Ÿ‚Ž ‚›€†…›• ˆ‹ˆ Ž„€‡“Œ…‚€…Œ›•, ‚Š‹ž—€Ÿ, Ž … Žƒ€ˆ—ˆ‚€Ÿ‘œ ƒ€€’ˆŸŒˆ ’Ž‚€Ž‰ ˆƒŽ„Ž‘’ˆ, ‘ŽŽ’‚…’‘’‚ˆŸ Ž …ƒŽ ŠŽŠ…’ŽŒ“ €‡€—…ˆž ˆ Ž’‘“’‘’‚ˆŸ €“˜…ˆ‰ €‚. ˆ ‚ Š€ŠŽŒ ‘‹“—€… €‚’Ž› ˆ‹ˆ €‚ŽŽ‹€„€’…‹ˆ … …‘“’ Ž’‚…’‘’‚…Ž‘’ˆ Ž ˆ‘Š€Œ Ž ‚Ž‡Œ…™…ˆˆ “™…€, “›’ŠŽ‚ ˆ‹ˆ „“ƒˆ• ’…Ž‚€ˆ‰ Ž „…‰‘’‚“ž™ˆŒ ŠŽ’€Š’€Œ, „…‹ˆŠ’€Œ ˆ‹ˆ ˆŽŒ“, ‚Ž‡ˆŠ˜ˆŒ ˆ‡, ˆŒ…ž™ˆŒ ˆ—ˆŽ‰ ˆ‹ˆ ‘‚Ÿ‡€›Œ ‘ Žƒ€ŒŒ›Œ Ž…‘…—…ˆ…Œ ˆ‹ˆ ˆ‘Ž‹œ‡Ž‚€ˆ…Œ Žƒ€ŒŒŽƒŽ Ž…‘…—…ˆŸ ˆ‹ˆ ˆ›Œˆ „…‰‘’‚ˆŸŒˆ ‘ Žƒ€ŒŒ›Œ Ž…‘…—…ˆ…Œ.
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/localized/license.coco b/scripts/windows/coco-dev-setup/batch/config/localized/license.coco
new file mode 100755
index 000000000..9b753bf10
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/localized/license.coco
@@ -0,0 +1,10 @@
+
+The MIT License (MIT)
+
+Copyright (c) 2014 CodeCombat Inc. and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in allcopies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN sCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THESOFTWARE.
diff --git a/scripts/windows/coco-dev-setup/batch/config/localized/readme-nl.coco b/scripts/windows/coco-dev-setup/batch/config/localized/readme-nl.coco
new file mode 100755
index 000000000..97258bb1b
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/localized/readme-nl.coco
@@ -0,0 +1,30 @@
+ _____ _ _____ _ _
+ / __ \ | | / __ \ | | | |
+ | / \/ ___ __| | ___ | / \/ ___ _ __ ___ | |__ __ _| |_
+ | | / _ \ / _` |/ _ \ | | / _ \| '_ ` _ \| '_ \ / _` | __|
+ | \__/\ (_) | (_| | __/ | \__/\ (_) | | | | | | |_) | (_| | |_
+ \____/\___/ \__,_|\___| \____/\___/|_| |_| |_|_.__/ \__,_|\__|
+
+=============================================================================
+
+Gefeliciteerd, je bent nu een deel van de CodeCombat gemeenschap.
+Nu dat je ontwikkelingsomgeving volledig klaar is kun je beginnen met bijdragen
+en ons helpen de wereld een betere plek te maken.
+
+Heb je enige vragen of wil je ons ontmoeten?
+Praat met ons op hipchat @ https://www.hipchat.com/g3plnOKqa
+
+Je kunt ons ook bereiken via de forums.
+Deze zijn te vinden @ http://discourse.codecombat.com/
+
+De laatste ontwikkelingen kun je ook altijd volgen op onze blog.
+Deze is te vinden @ http://blog.codecombat.com/
+
+Tenslotte kun je de meeste documentatie en informatie vinden
+op onze wiki @ https://github.com/codecombat/codecombat/wiki
+
+We hopen dat je het naar je zin zult hebben en net zoveel plezier zult beleven als wij.
+
+
+ - Nick, George, Scott, Michael, Jeremy and Glen
+
diff --git a/scripts/windows/coco-dev-setup/batch/config/localized/readme-ru.coco b/scripts/windows/coco-dev-setup/batch/config/localized/readme-ru.coco
new file mode 100644
index 000000000..c62f89900
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/localized/readme-ru.coco
@@ -0,0 +1,29 @@
+ _____ _ _____ _ _
+ / __ \ | | / __ \ | | | |
+ | / \/ ___ __| | ___ | / \/ ___ _ __ ___ | |__ __ _| |_
+ | | / _ \ / _` |/ _ \ | | / _ \| '_ ` _ \| '_ \ / _` | __|
+ | \__/\ (_) | (_| | __/ | \__/\ (_) | | | | | | |_) | (_| | |_
+ \____/\___/ \__,_|\___| \____/\___/|_| |_| |_|_.__/ \__,_|\__|
+
+=============================================================================
+
+®§¤à ¢«ï¥¬, ⥯¥àì ¢ë ç áâì á®®¡é¥á⢠CodeCombat.
+’¥¯¥àì, ª®£¤ ¢ è á। à §à ¡®â稪 ãáâ ®¢«¥ , ¢ë £®â®¢ë ç âì
+¢®á¨âì ¢ª« ¤ ¨ ¯®¬®çì ¬ ᤥ« âì íâ®â ¬¨à «ãçè¥.
+
+“ ¢ á ¥áâì ¢®¯à®áë ¨«¨ ¢ë å®â¥«¨ ¡ë á ¬¨ ¢áâà¥â¨âìáï?
+®£®¢®à¨â¥ á ¬¨ ¢ hipchat @ https://www.hipchat.com/g3plnOKqa
+
+…é¥ ®¤¨ ᯮᮡ ¤®á⨦¥¨ï í⮣® - ¯®á¥é¥¨¥ 襣® ä®à㬠.
+‚ë ¬®¦¥â¥ ©â¨ ¥£® @ http://discourse.codecombat.com/
+
+‚ë ¬®¦¥â¥ ¯à®ç¨â âì ® ¯®á«¥¤¨å ¤®á⨦¥¨ïå ¢ 襬 ¡«®£¥.
+…£® ¬®¦® ©â¨ @ http://blog.codecombat.com/
+
+ˆ ¯®á«¥¤¥¥, ® ¥ ¯® § 票î, - ¢ë ¬®¦¥â¥ ©â¨ ¡®«ìèãî ç áâì ¤®ªã¬¥â 樨
+¨ ¨ä®à¬ 樨 ¢ 襩 ¢¨ª¨ @ https://github.com/codecombat/codecombat/wiki
+
+Œë ¤¥¥¬áï, çâ® ¢ë ¡ã¤¥â¥ á« ¦¤ âìáï ¢ 襬 á®®¡é¥á⢥ â ª ¦¥, ª ª ¨ ¬ë.
+
+
+ - ¨ª, „¦®à¤¦, ‘ª®ââ, Œ¨å í«ì, „¦¥à¥¬¨ ¨ ƒ«¥
diff --git a/scripts/windows/coco-dev-setup/batch/config/readme.coco b/scripts/windows/coco-dev-setup/batch/config/localized/readme.coco
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/config/readme.coco
rename to scripts/windows/coco-dev-setup/batch/config/localized/readme.coco
diff --git a/scripts/windows/coco-dev-setup/batch/config/localized/tips-nl.coco b/scripts/windows/coco-dev-setup/batch/config/localized/tips-nl.coco
new file mode 100755
index 000000000..bc12d3bf5
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/localized/tips-nl.coco
@@ -0,0 +1,8 @@
+ 1) Antwoord voorzichtig en juist, indien er een vraag gesteld wordt.
+ 2) Deze installatie is nog steeds in beta en kan bugs bevatten.
+ 3) Rapporteer bugs op 'https://github.com/codecombat/codecombat/issues'
+ 4) Heb je vragen of suggesties? Praat met ons op HipChat via CodeCombat.com
+
+ Je kan een Engelstalige stappengids
+ voor deze installatie vinden op onze wiki:
+ github.com/codecombat/codecombat/wiki/Setup-on-Windows:-a-step-by-step-guide
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/localized/tips-ru.coco b/scripts/windows/coco-dev-setup/batch/config/localized/tips-ru.coco
new file mode 100644
index 000000000..90d791d16
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/localized/tips-ru.coco
@@ -0,0 +1,7 @@
+ 1) Š®£¤ § ¤ ñâáï ¢®¯à®á, ¯®¦ «ã©áâ , ®â¢¥ç ©â¥ ¢¨¬ â¥«ì® ¨ ¯à ¢¨«ì®
+ 2) „ ë© ãáâ ®¢é¨ª 室¨âáï ¢ áâ ¤¨¨ ¡¥âë ¨ ¬®¦¥â ᮤ¥à¦ âì ¡ £¨
+ 3) ‚ë ¬®¦¥â¥ á®®¡é âì ® ¡ £ å @ 'https://github.com/codecombat/codecombat/issues'
+ 4) …áâì ¢®¯à®áë/¯à¥¤«®¦¥¨ï? ®£®¢®à¨â¥ á ¬¨ ¢ HipChat ç¥à¥§ CodeCombat.com
+
+ ‚ë ¬®¦¥â¥ ©â¨ ¯®è £®¢®¥ à㪮¢®¤á⢮ ¤«ï ¤ ®£® ãáâ ®¢é¨ª ¢ 襩 ¢¨ª¨.
+ github.com/codecombat/codecombat/wiki/Setup-on-Windows:-a-step-by-step-guide
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/tips.coco b/scripts/windows/coco-dev-setup/batch/config/localized/tips.coco
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/config/tips.coco
rename to scripts/windows/coco-dev-setup/batch/config/localized/tips.coco
diff --git a/scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco b/scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco
old mode 100755
new mode 100644
index 968e651dd..53a47af88
--- a/scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco
@@ -1,7 +1,7 @@
- _ _ _________ ___ ____________ _ _ _ _ _____ _ _
- | \ | || ___ \ \/ | | ___ \ ___ \ | | | \ | / __ \| | | |
- | \| || |_/ / . . | ______ | |_/ / |_/ / | | | \| | / \/| |_| |
- | . ` || __/| |\/| | |______| | ___ \ /| | | | . ` | | | _ |
- | |\ || | | | | | | |_/ / |\ \| |_| | |\ | \__/\| | | |
- \_| \_/\_| \_| |_/ \____/\_| \_|\___/\_| \_/\____/\_| |_/
+ _ _ _________ ___ ____________ _ _ _ _ _____ _ _
+ | \ | || ___ \ \/ | | ___ \ ___ \ | | | \ | / __ \| | | |
+ | \| || |_/ / . . | ______ | |_/ / |_/ / | | | \| | / \/| |_| |
+ | . ` || __/| |\/| | |______| | ___ \ /| | | | . ` | | | _ |
+ | |\ || | | | | | | |_/ / |\ \| |_| | |\ | \__/\| | | |
+ \_| \_/\_| \_| |_/ \____/\_| \_|\___/\_| \_/\____/\_| |_/
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/configuration.exe b/scripts/windows/coco-dev-setup/batch/configuration.exe
new file mode 100755
index 000000000..28177aeab
Binary files /dev/null and b/scripts/windows/coco-dev-setup/batch/configuration.exe differ
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/fr.coco b/scripts/windows/coco-dev-setup/batch/localisation/fr.coco
deleted file mode 100755
index 1c92b433c..000000000
--- a/scripts/windows/coco-dev-setup/batch/localisation/fr.coco
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
- français
- From now on we'll send our feedback in English!
-
-
-
- -bit computer detected.
- The operating system
- was detected.
- We don't support Windows XP, installation cancelled.
-
-
- Have you already installed all the software needed for CodeCombat?
- We recommand that you reply negative in case you're not sure.
- Skipping the installation of the software...
- CodeCombat couldn't be developed without third-party software.
- That's why you'll need to install this software,
- in order to start contributing to our community.
- Cancel the installation if you already have the application.
- Make sure to select the option that adds the application to your Windows Path, if the option is available.
- Do you already have the latest version of
- installed?
- is downloading...
- is installing...
- is unzipping...
- is cleaning...
- Please define the full path where mongodb should be installed
-
-
-
-
- CodeCombat is opensource, like you already know.
- All our sourcecode can be found online at Github.
- You can choose to do the entire Git setup yourself.
- However we recommend that you instead let us handle it instead.
-
-
- Do you want to do the Local Git setup manually yourself?
- Make sure you have correctly setup your repository before processing.
- Do not close this window please.
- When you're ready, press any key to continue...
-
-
- Please give the full path of your CodeCombat git repository:
- Please enter the full path where you want to install your CodeCombat environment
- This installation requires Git Bash.
- Git bash is by default installed at 'C:\Program Files (x86)\Git'.
- Git bash is by default installed at 'C:\Program Files\Git'.
- Please enter the full path where git bash is installed or just press enter if it's in the default location
- Do you want to checkout the repository via ssh?
-
-
-
- Installing bower, brunch, nodemon and sendwithus...
- Installing bower packages...
- Installing sass...
- Installing npm...
- Starting brunch....
- Setting up a MongoDB database for you...
- Downloading the last version of the CodeCombat database...
-
-
-
- That path already exists, are you sure you want to overwrite it?
- That path doesn't exist. Please try again...
-
-
- The setup of the CodeCombat Dev. Environment was succesfull.
- Thank you already for your contribution and see you soon.
- Do you want to read the README for more information?
-
-
- From now on you can start the dev. environment at
- the touch of a single mouse click.
- 1) Just double click
- and let the environment start up.
- 2) Now just open 'localhost:3000' in your prefered browser.
- That's it, you're now ready to start working on CodeCombat!
-
-
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco b/scripts/windows/coco-dev-setup/batch/localisation/nl.coco
deleted file mode 100755
index 654d45c97..000000000
--- a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
- Nederlands
- Vanaf nu geven we onze feedback in het Nederlands!
-
-
-
- -bit computer gedetecteerd.
- Het besturingsysteem
- is gedetecteerd.
- Wij ondersteunen Windows XP niet, installatie geanulleerd.
-
-
- Heb je alle benodige software al geinstalleerd?
- We raden aan dat je negatief antwoord indien je niet zeker bent.
- De installatie van software wordt geanulleerd...
- CodeCombat kon niet worden ontwikkeld zonder third-party software.
- Dat is waarom je deze software moet installeren,
- zodat je je kan beginnen met het bijdragen tot onze gemeenschap.
- Annuleer de installatie als je de applicatie al hebt.
- Zorg er zeker voor dat je de optie selecteert dat de applicatie aan je Windows Path toevoegt, als de optie beschikbaar is.
- Heb je al de laatste versie van
- geinstalleerd?
- is aan het downloaden...
- is aan het installeren...
- is aan het uitpakken...
- is aan het opkuisen...
- Geef het volledige pad op, waar mongodb mag worden geinstalleerd
-
-
-
-
- CodeCombat is opensource, zoals je waarschijnlijk wel al weet.
- Je kan al onze sourcecode vinden op Github.
- Indien je wil, kan je de Git setup manueel doen.
- Maar wij raden aan dat je ons dit automatisch laat afhandellen.
-
-
- Wil je de lokale Git setup manueel doen?
- Zorg er zeker voor dat jouw git repository correct is.
- Sluit dit venster niet alsjeblieft.
- Wanneer je klaar bent, druk dan eender welke toets om verder te gaan...
-
-
- Geef alsjeblieft het volledige pad van je CodeCombat git repository:
- Geef alsjeblieft het volledige pad waar je de CodeCombat Ontwikkelings omgeving will installeren
- Deze installatie maakt gebruik van Git Bash.
- Git bash is normaal geinstalleerd in 'C:\Program Files (x86)\Git'.
- Git bash is normaal geinstalleerd in 'C:\Program Files\Git'.
- Geef alsjeblieft het volledige pad op van Git Bash of druk gewoon op enter indien je het pad niet gewijzigd heeft
- Wil je het git project downloaden via ssh?
-
-
-
- Installing bower, brunch, nodemon and sendwithus...
- Installing bower packages...
- Installing sass...
- Installing npm...
- Starting brunch....
- Setting up a MongoDB database for you...
- Downloading the last version of the CodeCombat database...
-
-
-
- Dat pad bestaat al, ben je zeker dat je het wil overschrijven?
- Dat pad bestaat niet, probeer alsjeblieft opnieuw...
-
-
- De installatie van de CodeCombat-Ontwikkelings omgeving was succesvol.
- Alvast bedankt voor al je werk en tot binnenkort.
- Wil je de LEESMIJ lezen voor meer informatie?
-
-
- Vanaf nu kan je de ontwikkelings omgeving opstarten
- met het gemak van een enkele muisklik.
- 1) Dubbelklik op
- en laat de omgeving opstarten.
- 2) Nu kan je 'localhost:3000' openen in je browser naar voorkeur.
- Dat is het, je bent nu klaar om te starten met je werk aan CodeCombat.
-
-
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco b/scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
deleted file mode 100755
index 2eca2705c..000000000
--- a/scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
- 简体ä¸æ–‡
- From now on we'll send our feedback in English!
-
-
-
- -bit computer detected.
- The operating system
- was detected.
- We don't support Windows XP, installation cancelled.
-
-
- Have you already installed all the software needed for CodeCombat?
- We recommand that you reply negative in case you're not sure.
- Skipping the installation of the software...
- CodeCombat couldn't be developed without third-party software.
- That's why you'll need to install this software,
- in order to start contributing to our community.
- Cancel the installation if you already have the application.
- Make sure to select the option that adds the application to your Windows Path, if the option is available.
- Do you already have the latest version of
- installed?
- is downloading...
- is installing...
- is unzipping...
- is cleaning...
- Please define the full path where mongodb should be installed
-
-
-
-
- CodeCombat is opensource, like you already know.
- All our sourcecode can be found online at Github.
- You can choose to do the entire Git setup yourself.
- However we recommend that you instead let us handle it instead.
-
-
- Do you want to do the Local Git setup manually yourself?
- Make sure you have correctly setup your repository before processing.
- Do not close this window please.
- When you're ready, press any key to continue...
-
-
- Please give the full path of your CodeCombat git repository:
- Please enter the full path where you want to install your CodeCombat environment
- This installation requires Git Bash.
- Git bash is by default installed at 'C:\Program Files (x86)\Git'.
- Git bash is by default installed at 'C:\Program Files\Git'.
- Please enter the full path where git bash is installed or just press enter if it's in the default location
- Do you want to checkout the repository via ssh?
-
-
-
- Installing bower, brunch, nodemon and sendwithus...
- Installing bower packages...
- Installing sass...
- Installing npm...
- Starting brunch....
- Setting up a MongoDB database for you...
- Downloading the last version of the CodeCombat database...
-
-
-
- That path already exists, are you sure you want to overwrite it?
- That path doesn't exist. Please try again...
-
-
- The setup of the CodeCombat Dev. Environment was succesfull.
- Thank you already for your contribution and see you soon.
- Do you want to read the README for more information?
-
-
- From now on you can start the dev. environment at
- the touch of a single mouse click.
- 1) Just double click
- and let the environment start up.
- 2) Now just open 'localhost:3000' in your prefered browser.
- That's it, you're now ready to start working on CodeCombat!
-
-
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/zh.coco b/scripts/windows/coco-dev-setup/batch/localisation/zh.coco
deleted file mode 100755
index b84d84146..000000000
--- a/scripts/windows/coco-dev-setup/batch/localisation/zh.coco
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
- ä¸æ–‡
- From now on we'll send our feedback in English!
-
-
-
- -bit computer detected.
- The operating system
- was detected.
- We don't support Windows XP, installation cancelled.
-
-
- Have you already installed all the software needed for CodeCombat?
- We recommand that you reply negative in case you're not sure.
- Skipping the installation of the software...
- CodeCombat couldn't be developed without third-party software.
- That's why you'll need to install this software,
- in order to start contributing to our community.
- Cancel the installation if you already have the application.
- Make sure to select the option that adds the application to your Windows Path, if the option is available.
- Do you already have the latest version of
- installed?
- is downloading...
- is installing...
- is unzipping...
- is cleaning...
- Please define the full path where mongodb should be installed
-
-
-
-
- CodeCombat is opensource, like you already know.
- All our sourcecode can be found online at Github.
- You can choose to do the entire Git setup yourself.
- However we recommend that you instead let us handle it instead.
-
-
- Do you want to do the Local Git setup manually yourself?
- Make sure you have correctly setup your repository before processing.
- Do not close this window please.
- When you're ready, press any key to continue...
-
-
- Please give the full path of your CodeCombat git repository:
- Please enter the full path where you want to install your CodeCombat environment
- This installation requires Git Bash.
- Git bash is by default installed at 'C:\Program Files (x86)\Git'.
- Git bash is by default installed at 'C:\Program Files\Git'.
- Please enter the full path where git bash is installed or just press enter if it's in the default location
- Do you want to checkout the repository via ssh?
-
-
-
- Installing bower, brunch, nodemon and sendwithus...
- Installing bower packages...
- Installing sass...
- Installing npm...
- Starting brunch....
- Setting up a MongoDB database for you...
- Downloading the last version of the CodeCombat database...
-
-
-
- That path already exists, are you sure you want to overwrite it?
- That path doesn't exist. Please try again...
-
-
- The setup of the CodeCombat Dev. Environment was succesfull.
- Thank you already for your contribution and see you soon.
- Do you want to read the README for more information?
-
-
- From now on you can start the dev. environment at
- the touch of a single mouse click.
- 1) Just double click
- and let the environment start up.
- 2) Now just open 'localhost:3000' in your prefered browser.
- That's it, you're now ready to start working on CodeCombat!
-
-
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/de.coco b/scripts/windows/coco-dev-setup/batch/localization/de.coco
old mode 100755
new mode 100644
similarity index 75%
rename from scripts/windows/coco-dev-setup/batch/localisation/de.coco
rename to scripts/windows/coco-dev-setup/batch/localization/de.coco
index fc257a64d..f4f93fdb2
--- a/scripts/windows/coco-dev-setup/batch/localisation/de.coco
+++ b/scripts/windows/coco-dev-setup/batch/localization/de.coco
@@ -1,82 +1,108 @@
-
-
-
- Deutsch
- Ab jetzt senden wir unser Feedback in Englisch!
-
-
-
- -Bit System erkannt.
- Es wurde das Betriebssystem
- erkannt.
- Windows XP wird nicht unterstützt. Installation abgebrochen.
-
-
- Sind die für CodeCombat benötigten Programme bereits installiert?
- Wir empfehlen Ihnen, mit „Nein“ zu antorten, falls Sie unsicher sind.
- Ãœberspringe Installation der Programme...
- Ohne Software von Drittanbietern könnte CodeCombat nicht entwickelt werden.
- Aus diesem Grund müssen Sie diese Software installieren,
- um sich in der Community zu engagieren.
- Wenn Sie ein Programm bereits installiert haben, brechen Sie die Installation bitte ab.
- Make sure to select the option that adds the application to your Windows Path, if the option is available.
- Haben Sie bereits die aktuellste Version von
- installiert?
- wird heruntergeladen...
- wird installiert...
- wird entpackt...
- wird aufgeräumt...
- Bitte geben Sie den kompletten Pfad an, an dem MongoDB installiert werden soll
-
-
-
-
- Wie Du bereits weißt, ist CodeCombat Open Source.
- Unser Quellcode ist komplett auf Github.
- Wenn Du möchtest, kannst du das komplette Git Repository selbst herunterladen und nach deinen wünschen einrichten.
- Allerdings empfehlen wir, dass du den Prozess statt dessen uns überlässt.
-
-
- Willst du das lokale Git Setup selbst vornehmen?
- Bit vergewissere dich, dass das Repository korrekt heruntergeladen wurde, bevor du fortfährst.
- Bitte schließe dieses Fenster nicht.
- Wenn du fertig bist, drücke eine beliebige Taste zum Fortfahren...
-
-
- Gebe bitte den kompletten Pfad zu deinem CodeCombat Git Repository ein:
- Bitte gib den kompletten Pfad ein, an dem du die CodeCombat Umgebung einrichten willst
- Diese Installation benötigt die Git Bash.
- Die Git Bash ist standardmäßig in 'C:\Program Files (x86)\Git' installiert.
- Die Git Bash ist standardmäßig in 'C:\Program Files\Git' installiert.
- Bitte gebe den kompletten Pfad zur Git Bash ein, oder drücke Enter, um den Standardpfad zu verwenden
- Willst du das Repository via SSH auschecken?
-
-
-
- Installing bower, brunch, nodemon and sendwithus...
- Installing bower packages...
- Installing sass...
- Installing npm...
- Starting brunch....
- Setting up a MongoDB database for you...
- Downloading the last version of the CodeCombat database...
-
-
-
- Dieser Pfad existiert bereits. Willst du ihn wirklich überschreiben?
- Dieser Pfad exisitert nicht. Bitte versuche es erneut...
-
-
- Die CodeCombat Entwicklungsumgebung wurde erfoglreich installiert.
- Vielen Dank für die Unterstützung und bis bald.
- Willst du das README lesen, um weitere Informationen zu erhalten?
-
-
- Von nun an kannst du die Entwicklungsumgebung starten unter
- einmal mit der Maus klicken.
- 1) Einfach Doppelklicken
- und warten bis die Entwicklungsumgebung fertig geladen hat.
- 2) Jetzt 'localhost:3000' in deinem bevorzugten Browser aufrufen.
- Fertig. Du bist nun bereit, bei CodeCombat mitzuarbeiten!
-
+
+
+
+ Deutsch
+ German
+ Before we start the installation, here are some tips:
+ Press any key to exit...
+
+
+ You have choosen Deutsch as your language.
+ Ab jetzt senden wir unser Feedback in Deutsch.
+
+
+ In order to continue the installation of the developers environment
+ you will have to read and agree with the following license:
+ Have you read the license and do you agree with it?
+ This setup can't happen without an agreement.
+ Installation and Setup of the CodeCombat environment is cancelled.
+
+
+
+ -Bit System erkannt.
+ Es wurde das Betriebssystem
+ erkannt.
+ Windows XP wird nicht unterstützt. Installation abgebrochen.
+
+
+ Sind die für CodeCombat benötigten Programme bereits installiert?
+ Wir empfehlen Ihnen, mit „Nein“ zu antorten, falls Sie unsicher sind.
+ Ãœberspringe Installation der Programme...
+ Ohne Software von Drittanbietern könnte CodeCombat nicht entwickelt werden.
+ Aus diesem Grund müssen Sie diese Software installieren,
+ um sich in der Community zu engagieren.
+ Wenn Sie ein Programm bereits installiert haben, brechen Sie die Installation bitte ab.
+ Make sure to select the option that adds the application to your Windows Path, if the option is available.
+ Haben Sie bereits die aktuellste Version von
+ installiert?
+ wird heruntergeladen...
+ wird installiert...
+ wird entpackt...
+ wird aufgeräumt...
+ Bitte geben Sie den kompletten Pfad an, an dem MongoDB installiert werden soll
+
+
+
+
+ Wie Du bereits weißt, ist CodeCombat Open Source.
+ Unser Quellcode ist komplett auf Github.
+ Wenn Du möchtest, kannst du das komplette Git Repository selbst herunterladen und nach deinen wünschen einrichten.
+ Allerdings empfehlen wir, dass du den Prozess statt dessen uns überlässt.
+
+
+ Willst du das lokale Git Setup selbst vornehmen?
+ Bit vergewissere dich, dass das Repository korrekt heruntergeladen wurde, bevor du fortfährst.
+ Bitte schließe dieses Fenster nicht.
+ Wenn du fertig bist, drücke eine beliebige Taste zum Fortfahren...
+
+
+ Gebe bitte den kompletten Pfad zu deinem CodeCombat Git Repository ein:
+ Bitte gib den kompletten Pfad ein, an dem du die CodeCombat Umgebung einrichten willst
+ Diese Installation benötigt die Git Bash.
+ Die Git Bash ist standardmäßig in 'C:\Program Files (x86)\Git' installiert.
+ Die Git Bash ist standardmäßig in 'C:\Program Files\Git' installiert.
+ Bitte gebe den kompletten Pfad zur Git Bash ein, oder drücke Enter, um den Standardpfad zu verwenden
+ Willst du das Repository via SSH auschecken?
+
+
+ You should have forked CodeCombat to your own GitHub Account by now...
+ Please enter your github information, to configure your local repository.
+ Username:
+ Password:
+ Thank you... Configuring your local repistory right now...
+
+
+
+ The installation of your local environment was succesfull!
+ You can now close this setup.
+ After that, you should open the configuration setup to automaticly configure your environment...
+
+
+ Installing bower, brunch, nodemon and sendwithus...
+ Installing bower packages...
+ Installing sass...
+ Installing npm...
+ Starting brunch....
+ Setting up a MongoDB database for you...
+ Downloading the last version of the CodeCombat database...
+
+ Don't close!
+
+
+ Dieser Pfad existiert bereits. Willst du ihn wirklich überschreiben?
+ Dieser Pfad exisitert nicht. Bitte versuche es erneut...
+
+
+ Die CodeCombat Entwicklungsumgebung wurde erfoglreich installiert.
+ Vielen Dank für die Unterstützung und bis bald.
+ Willst du das README lesen, um weitere Informationen zu erhalten?
+
+
+ Von nun an kannst du die Entwicklungsumgebung starten unter
+ einmal mit der Maus klicken.
+ 1) Einfach Doppelklicken
+ und warten bis die Entwicklungsumgebung fertig geladen hat.
+ 2) Jetzt 'localhost:3000' in deinem bevorzugten Browser aufrufen.
+ Fertig. Du bist nun bereit, bei CodeCombat mitzuarbeiten!
+
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/en.coco b/scripts/windows/coco-dev-setup/batch/localization/en.coco
similarity index 72%
rename from scripts/windows/coco-dev-setup/batch/localisation/en.coco
rename to scripts/windows/coco-dev-setup/batch/localization/en.coco
index 947890ee8..bef7c9ae6 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/en.coco
+++ b/scripts/windows/coco-dev-setup/batch/localization/en.coco
@@ -2,8 +2,21 @@
English
- From now on we'll send our feedback in English!
+ English
+ Before we start the installation, here are some tips:
+ Press any key to exit...
+
+ You have choosen English as your language.
+ From now on we'll send our feedback in English.
+
+
+ In order to continue the installation of the developers environment
+ you will have to read and agree with the following license:
+ Have you read the license and do you agree with it?
+ This setup can't happen without an agreement.
+ Installation and Setup of the CodeCombat environment is cancelled.
+
-bit computer detected.
@@ -51,7 +64,19 @@
Please enter the full path where git bash is installed or just press enter if it's in the default location
Do you want to checkout the repository via ssh?
+
+ You should have forked CodeCombat to your own GitHub Account by now...
+ Please enter your github information, to configure your local repository.
+ Username:
+ Password:
+ Thank you... Configuring your local repistory right now...
+
+
+ The installation of your local environment was succesfull!
+ You can now close this setup.
+ After that, you should open the configuration setup to automaticly configure your environment...
+
Installing bower, brunch, nodemon and sendwithus...
Installing bower packages...
@@ -61,6 +86,7 @@
Setting up a MongoDB database for you...
Downloading the last version of the CodeCombat database...
+ Don't close!
That path already exists, are you sure you want to overwrite it?
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/languages.coco b/scripts/windows/coco-dev-setup/batch/localization/languages.coco
similarity index 66%
rename from scripts/windows/coco-dev-setup/batch/localisation/languages.coco
rename to scripts/windows/coco-dev-setup/batch/localization/languages.coco
index a267d65d0..2f3e2fe0d 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/languages.coco
+++ b/scripts/windows/coco-dev-setup/batch/localization/languages.coco
@@ -1,7 +1,6 @@
en
+ru
nl
de
-fr
-zh
zh-HANT
zh-HANS
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localization/nl.coco b/scripts/windows/coco-dev-setup/batch/localization/nl.coco
new file mode 100755
index 000000000..a969efb31
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/localization/nl.coco
@@ -0,0 +1,108 @@
+
+
+
+ Nederlands
+ Dutch
+ Voor we verder gaan met de installatie hier volgen enkele tips:
+ Druk een willekeurige toets in om af te sluiten...
+
+
+ Je hebt Nederlands gekozen als jouw taal naar keuze.
+ Vanaf nu geven we onze feedback in het Nederlands.
+
+
+ Om verder te gaan met de installatie van jouw CodeCombat omgeving
+ moet je de licentieovereenkomst lezen en ermee akkoord gaan.
+ Heb je de licentieovereenkomst gelezen en ga je ermee akkoord?
+ Deze installatie kan niet doorgaan zonder jouw akkoord.
+ De installatie van jouw Developers omgeving is nu geannulleerd.
+
+
+
+ -bit computer gedetecteerd.
+ Het besturingssysteem
+ is gedetecteerd.
+ Wij ondersteunen Windows XP niet, installatie geannuleerd.
+
+
+ Heb je alle benodige software al geïnstalleerd?
+ We raden aan dat je negatief antwoord indien je niet zeker bent.
+ De installatie van software wordt geannuleerd...
+ CodeCombat kon niet worden ontwikkeld zonder third-party software.
+ Dat is waarom je deze software moet installeren,
+ zodat je kan beginnen met het bijdragen tot onze gemeenschap.
+ Annuleer de installatie als je de applicatie al hebt.
+ Zorg er zeker voor dat je de optie selecteert die de applicatie aan je Windows Path toevoegt, als deze optie beschikbaar is.
+ Heb je al de laatste versie van
+ geïnstalleerd?
+ is aan het downloaden...
+ is aan het installeren...
+ is aan het uitpakken...
+ is aan het opkuisen...
+ Geef het volledige pad op waar mongodb mag worden geïnstalleerd
+
+
+
+
+ CodeCombat is open-source, zoals je waarschijnlijk wel al weet.
+ Je kunt al onze source code vinden op Github.
+ Indien je wil, kan je de Git setup ook manueel doen.
+ Maar wij raden aan dat je ons dit automatisch laat afhandelen.
+
+
+ Wil je de lokale Git setup manueel doen?
+ Zorg er zeker voor dat jouw git repository correct is.
+ Sluit dit venster alsjeblieft niet.
+ Wanneer je klaar bent, druk dan op eender welke toets om verder te gaan...
+
+
+ Geef alsjeblieft het volledige pad in van je CodeCombat git repository:
+ Geef alsjeblieft het volledige pad in waar je de CodeCombat ontwikkelingsomgeving wilt installeren
+ Deze installatie maakt gebruik van Git Bash.
+ Git bash is normaal gezien geïnstalleerd in 'C:\Program Files (x86)\Git'.
+ Git bash is normaal gezien geïnstalleerd in 'C:\Program Files\Git'.
+ Geef alsjeblieft het volledige pad op van Git Bash of druk gewoon op enter indien je het pad niet gewijzigd hebt.
+ Wil je het git project downloaden via ssh?
+
+
+ Je zou nu al een eigen CodeCombat-fork moeten hebben gekoppeld aan jouw GitHub account...
+ Geef jou GitHub informatie alstublieft, zodat wij jou lokale repositorie kunnen configureren.
+ Gebruikersnaam:
+ Wachtwoord:
+ Dank u, jouw lokaal project wordt nu geconfigureerd...
+
+
+
+ De installatie van jouw lokale omgeving was een succes!
+ Je kan nu deze setup sluiten.
+ Nadien, kan je de 'configuration' setup openen om jouw omgeving automatisch te configureren...
+
+
+ Bezig met het installeren van bower, brunch, nodemon en sendwithus...
+ Bower packages worden geïnstalleerd...
+ Sass wordt geïnstalleerd...
+ Npm wordt geïnstalleerd...
+ Brunch wordt gestart...
+ De MongoDB database wordt voor je klaargemaakt...
+ De laatste versie van de CodeCombat database wordt gedownload...
+
+ Niet sluiten!
+
+
+ Dat pad bestaat al, ben je zeker dat je het wil overschrijven?
+ Dat pad bestaat niet, probeer alsjeblieft opnieuw...
+
+
+ De installatie van de CodeCombat ontwikkelingsomgeving was succesvol.
+ Alvast bedankt voor al je werk en tot binnenkort.
+ Wil je de LEESMIJ lezen voor meer informatie?
+
+
+ Vanaf nu kan je de ontwikkelingsomgeving opstarten
+ met het gemak van een enkele muisklik.
+ 1) Dubbelklik op
+ en laat de omgeving opstarten.
+ 2) Nu kan je 'localhost:3000' openen in je browser naar voorkeur.
+ Dat is het, je bent nu klaar om te starten met je werk aan CodeCombat.
+
+
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localization/ru.coco b/scripts/windows/coco-dev-setup/batch/localization/ru.coco
new file mode 100644
index 000000000..9914b5d44
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/localization/ru.coco
@@ -0,0 +1,108 @@
+
+
+
+ ðóññêèé
+ Russian
+ Ïåðåä òåì, êàê ìû íà÷í¸ì óñòàíîâêó, âîò íåñêîëüêî ñîâåòîâ:
+ Íàæìèòå Enter äëÿ âûõîäà...
+
+
+ Âû âûáðàëè ðóññêèé â êà÷åñòâå âàøåãî ÿçûêà.
+ C äàííîãî ìîìåíòà ìû áóäåì îáùàòüñÿ íà ðóññêîì.
+
+
+ Äëÿ òîãî, ÷òîáû ïðîäîëæèòü óñòàíîâêó ñðåäû ðàçðàáîò÷èêà
+ âû äîëæíû ïðî÷èòàòü è ñîãëàñèòüñÿ ñî ñëåäóþùåé ëèöåíçèåé:
+ Âû ïðî÷èòàëè ëèöåíçèþ è ñîãëàñíû ñ íåé?
+ Äàííàÿ óñòàíîâêà íå íà÷í¸òñÿ áåç ñîãëàñèÿ.
+ Óñòàíîâêà è íàñòðîéêà ñðåäû CodeCombat îòìåíåíà.
+
+
+
+ -áèòíûé êîìïüþòåð îáíàðóæåí.
+ Îáíàðóæåíà îïåðàöèîííàÿ ñèñòåìà
+ .
+ Ìû íå ïîääåðæèâàåì Windows XP, óñòàíîâêà îòìåíåíà.
+
+
+ Âû óæå óñòàíîâèëè âñ¸ ïðîãðàììíîå îáåñïå÷åíèå, íåîáõîäèìîå äëÿ CodeCombat?
+ Ìû ðåêóìåíäóåì îòâåòèòü îòðèöàòåëüíî, åñëè âû íå óâåðåíû.
+ Ïðîïóñê óñòàíîâêè ïðîãðàììíîãî îáåñïå÷åíèÿ...
+ CodeCombat íå ìîã áû áûòü ðàçðàáîòàí áåç ñòîðîííåãî ïðîãðàììíîãî îáåñïå÷åíèÿ.
+ Âîò ïî÷åìó âû äîëæíû áóäåòå óñòàíîâèòü ýòî ïðîãðàììíîå îáåñïå÷åíèå
+ äëÿ òîãî, ÷òîáû íà÷àòü âíîñèòü âêëàä â íàøå ñîîáùåñòâî.
+ Îòìåíèòå óñòàíîâêó, åñëè ó âàñ óæå åñòü ïðèëîæåíèå.
+ Óáåäèòåñü â âûáîðå îïöèè, êîòîðàÿ äîáàâëÿåò ïðèëîæåíèå â Windows PATH, åñëè îïöèÿ äîñòóïíà.
+ Ó âàñ óæå åñòü ïîñëåäíÿÿ âåðñèÿ
+ ?
+ çàãðóæàåòñÿ...
+ óñòàíàâëèâàåòñÿ...
+ ðàñïàêîâûâàåòñÿ...
+ ïðèáèðàåòñÿ...
+ Ïîæàëóéñòà, îïðåäåëèòå ïîëíûé ïóòü, êóäà äîëæåí áûòü óñòàíîâëåí MongoDB
+
+
+
+
+ Èñõîäíûé êîä CodeCombat îòêðûò, êàê âû óæå çíàåòå.
+ Âåñü íàø èñõîäíûé êîä ìîæåò áûòü íàéäåí îíëàéí â Github.
+ Âû ìîæåòå âûáðàòü öåëèêîì ñàìîñòîÿòåëüíóþ óñòàíîâêó Git.
+ Îäíàêî ìû ðåêîìåíäóåì, âìåñòî ýòîãî, ïåðåäàòü óïðàâëåíèå íàì.
+
+
+ Âû õîòèòå ïðîâåñòè óñòàíîâêó Local Git âðó÷íóþ ñàìîñòîÿòåëüíî?
+ Óáåäèòåñü, ÷òî âû ïðàâèëüíî íàñòðîèëè ðåïîçèòîðèé ïåðåä âûïîëíåíèåì.
+ Íå çàêðûâàéòå ýòî îêíî, ïîæàëóéñòà.
+ Êîãäà âû áóäåòå ãîòîâû, íàæìèòå Enter äëÿ ïðîäîëæåíèÿ...
+
+
+ Ïîæàëóéñòà, óêàæèòå ïîëíûé ïóòü äî âàøåãî CodeCombat ðåïîçèòîðèÿ git:
+ Ïîæàëóéñòà, ââåäèòå ïîëíûé ïóòü, êóäà âû õîòèòå óñòàíîâèòü ñðåäó CodeCombat
+ Äàííàÿ óñòàíîâêà òðåáóåò Git Bash.
+ Git bash ïî óìîë÷àíèþ óñòàíîâëåí â 'C:\Program Files (x86)\Git'.
+ Git bash ïî óìîë÷àíèþ óñòàíîâëåí â 'C:\Program Files\Git'.
+ Ïîæàëóéñòà, ââåäèòå ïîëíûé ïóòü, êóäà óñòàíîâëåí git bash èëè ïðîñòî íàæìèòå Enter, åñëè îí íàõîäèòñÿ â ïàïêå ïî óìîë÷àíèþ
+ Âû õîòèòå ïðîâåðÿòü ðåïîçèòîðèé ÷åðåç ssh?
+
+
+ Âû äîëæíû áûëè ñäåëàòü ôîðê CodeCombat íà âàøåì àêêàóíòå GitHub...
+ Ïîæàëóéñòà, ââåäèòå âàøè äàííûå github, ÷òîáû íàñòðîèòü ëîêàëüíûé ðåïîçèòîðèé.
+ Èìÿ ïîëüçîâàòåëÿ:
+ Ïàðîëü:
+ Ñïàñèáî... Èä¸ò íàñòðîéêà âàøåãî ëîêàëüíîãî ðåïîçèòîðèÿ...
+
+
+
+ Óñòàíîâêà âàøåé ëîêàëüíîé ñðåäû óñïåøíî çàâåðøåíà!
+ Òåïåðü âû ìîæåòå çàêðûòü äàííûé óñòàíîâùèê.
+ Ïîñëå ýòîãî âû äîëæíû îòêðûòü óñòàíîâùèê íàñòðîåê äëÿ àâòîìàòè÷åñêîé êîíôèãóðàöèè âàøåé ñðåäû...
+
+
+ Óñòàíîâêà bower, brunch, nodemon è sendwithus...
+ Óñòàíîâêà ïàêåòîâ bower...
+ Óñòàíîâêà sass...
+ Óñòàíîâêà npm...
+ Çàïóñê brunch....
+ Óñòàíîâêà áàçû äàííûõ MongoDB...
+ Ñêà÷èâàíèå ïîñëåäíåé âåðñèè áàçû äàííûõ CodeCombat...
+
+ Íå çàêðûâàéòå!
+
+
+ Ýòîò ïóòü óæå ñóùåñòâóåò, âû óâåðåíû, ÷òî õîòèòå ïåðåçàïèñàòü åãî?
+ Ýòîò ïóòü íå ñóùåñòâóåò. Ïîæàëóéñòà, ïîïðîáóéòå åù¸ ðàç...
+
+
+ Óñòàíîâêà ñðåäû ðàçðàáîò÷èêà CodeCombat óñïåøíî çàâåðøåíà.
+ Çàðàíåå ñïàñèáî çà âàø âêëàä è äî ñêîðîé âñòðå÷è.
+ Âû õîòèòå ïðî÷èòàòü README äëÿ ïîëó÷åíèÿ äîïîëíèòåëüíîé èíôîðìàöèè?
+
+
+ Ñ ýòîãî ìîìåíòà âû ìîæåòå çàïóñêàòü ñðåäó ðàçðàáîò÷èêà
+ ñ ïîìîùüþ ùåë÷êà ìûøè.
+ 1) Äâàæäû ù¸ëêíèòå
+ è äàéòå ñðåäå çàïóñòèòüñÿ.
+ 2) Òåïåðü ïðîñòî îòêðîéòå 'localhost:3000' â âàøåì ëþáèìîì áðàóçåðå.
+ Âîò è âñ¸, òåïåðü âû ãîòîâû ïðèñòóïèòü ê ðàáîòå íàä CodeCombat!
+
+
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localization/zh-HANS.coco b/scripts/windows/coco-dev-setup/batch/localization/zh-HANS.coco
new file mode 100644
index 000000000..62e3a4b6a
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/localization/zh-HANS.coco
@@ -0,0 +1,108 @@
+
+
+
+ 简体ä¸æ–‡
+ Traditional Chinese
+ Before we start the installation, here are some tips:
+ Press any key to exit...
+
+
+ You have choosen 简体ä¸æ–‡ as your language.
+ ç›®å‰æˆ‘们åªèƒ½ç”¨è‹±æ–‡ç»™ä½ å馈
+
+
+ In order to continue the installation of the developers environment
+ you will have to read and agree with the following license:
+ Have you read the license and do you agree with it?
+ This setup can't happen without an agreement.
+ Installation and Setup of the CodeCombat environment is cancelled.
+
+
+
+ -ä½ç³»ç»Ÿ.
+ æ“作系统
+ 被侦测到.
+ 我们ä¸æ”¯æŒ Windows XP, 安装å–消.
+
+
+ ä½ æ˜¯å¦å·²ç»å®‰è£…好è¿è¡Œ CodeCombat 所需的所有软件?
+ å¦‚æžœä½ ä¸ç¡®å®šçš„è¯è¯·å›žç” No.
+ æ£åœ¨è·³è¿‡æ¤è½¯ä»¶çš„安装...
+ CodeCombat æ— æ³•åœ¨ä¸ä½¿ç”¨ç¬¬ä¸‰æ–¹æœåŠ¡çš„情况下开å‘.
+ è¿™å°±æ˜¯ä¸ºä»€ä¹ˆä½ éœ€è¦å®‰è£…这些软件,
+ 为了开始给我们的开æºç¤¾åŒºåšè´¡çŒ®.
+ å¦‚æžœä½ å·²ç»æœ‰äº†è¿™äº›è½¯ä»¶ 请å–消安装.
+ Make sure to select the option that adds the application to your Windows Path, if the option is available.
+ ä½ æ˜¯å¦å·²ç»å®‰è£…了最新版本的
+ ?
+ æ£åœ¨ä¸‹è½½...
+ æ£åœ¨å®‰è£…...
+ æ£åœ¨è§£åŽ‹...
+ æ£åœ¨æ¸…ç†...
+ è¯·è¾“å…¥ä½ å¸Œæœ›å®‰è£… mongodb 的文件夹的全路径
+
+
+
+
+ CodeCombat 是开æºçš„.
+ 我们的所有æºä»£ç 都放在了 Github.
+ ä½ å¯ä»¥é€‰æ‹©è‡ªå·±æ‰‹å·¥å®‰è£… Git.
+ 但我们ä»ç„¶å»ºè®®è®©ç¨‹åºè‡ªåŠ¨æ›¿ä½ 完æˆ.
+
+
+ ä½ æ˜¯å¦æƒ³è‡ªå·±æ‰‹å·¥å®‰è£…本地 Git 安装?
+ 请确ä¿åœ¨å¼€å§‹å¤„ç†å‰, ä½ æœ‰æ£ç¡®è®¾ç½®å¥½ä½ 的库.
+ 请ä¸è¦å…³é—æ¤çª—å£.
+ å¦‚æžœä½ å‡†å¤‡å¥½äº†, 请按任æ„键继ç»...
+
+
+ è¯·è¾“å…¥ä½ CodeCombat git库的全路径:
+ è¯·è¾“å…¥ä½ æƒ³å®‰è£… CodeCombat 环境的全路径
+ è¿™é¡¹å®‰è£…éœ€è¦ Git Bash.
+ Git bash 默认安装在 'C:\Program Files (x86)\Git'.
+ Git bash 默认安装在 'C:\Program Files\Git'.
+ 请输入 git bash 的安装全路径, å¦‚æžœä½ å®‰è£…çš„æ˜¯é»˜è®¤è·¯å¾„, 那么直接输入回车å³å¯
+ ä½ æ˜¯å¦æƒ³ä½¿ç”¨ ssh æ¥æ£€å‡º(checkout)库(repository)?
+
+
+ You should have forked CodeCombat to your own GitHub Account by now...
+ Please enter your github information, to configure your local repository.
+ Username:
+ Password:
+ Thank you... Configuring your local repistory right now...
+
+
+
+ The installation of your local environment was succesfull!
+ You can now close this setup.
+ After that, you should open the configuration setup to automaticly configure your environment...
+
+
+ æ£åœ¨å®‰è£… bower, brunch, nodemon å’Œ sendwithus...
+ æ£åœ¨ç”¨ bower 安装ä¾èµ–包...
+ æ£åœ¨å®‰è£… sass...
+ æ£åœ¨å®‰è£… npm...
+ æ£åœ¨å¼€å¯ brunch....
+ æ£åœ¨ä¸ºä½ 设置 MongoDB æ•°æ®åº“...
+ æ£åœ¨ä¸‹è½½ CodeCombat æ•°æ®åº“的最新版本...
+
+ Don't close!
+
+
+ 这个路径已ç»å˜åœ¨, ä½ æƒ³è¦è¦†ç›–它å—?
+ 这个路径ä¸å˜åœ¨, 请å†æ¬¡å°è¯•...
+
+
+ CodeCombat å¼€å‘环境的æ建已æˆåŠŸ.
+ æ„Ÿè°¢~ 我们会很快å†æ¬¡è§é¢çš„ :)
+ ä½ æ˜¯å¦æƒ³é˜…读 README 文件以了解更多信æ¯?
+
+
+ From now on you can start the dev. environment at
+ the touch of a single mouse click.
+ 1) åŒå‡»æ–‡ä»¶
+ å¯åŠ¨å¼€å‘环境.
+ 2) 在æµè§ˆå™¨é‡Œè®¿é—® 'localhost:3000'
+ å¥½äº†ï¼Œä½ çŽ°åœ¨å¯ä»¥å¼€å§‹å¼€å‘ CodeCombat 了!
+
+
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco b/scripts/windows/coco-dev-setup/batch/localization/zh-HANT.coco
old mode 100755
new mode 100644
similarity index 74%
rename from scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco
rename to scripts/windows/coco-dev-setup/batch/localization/zh-HANT.coco
index 93bcefd87..2cdaba96e
--- a/scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco
+++ b/scripts/windows/coco-dev-setup/batch/localization/zh-HANT.coco
@@ -1,82 +1,108 @@
-
-
-
- ç¹ä½“ä¸æ–‡
- From now on we'll send our feedback in English!
-
-
-
- -bit computer detected.
- The operating system
- was detected.
- We don't support Windows XP, installation cancelled.
-
-
- Have you already installed all the software needed for CodeCombat?
- We recommand that you reply negative in case you're not sure.
- Skipping the installation of the software...
- CodeCombat couldn't be developed without third-party software.
- That's why you'll need to install this software,
- in order to start contributing to our community.
- Cancel the installation if you already have the application.
- Make sure to select the option that adds the application to your Windows Path, if the option is available.
- Do you already have the latest version of
- installed?
- is downloading...
- is installing...
- is unzipping...
- is cleaning...
- Please define the full path where mongodb should be installed
-
-
-
-
- CodeCombat is opensource, like you already know.
- All our sourcecode can be found online at Github.
- You can choose to do the entire Git setup yourself.
- However we recommend that you instead let us handle it instead.
-
-
- Do you want to do the Local Git setup manually yourself?
- Make sure you have correctly setup your repository before processing.
- Do not close this window please.
- When you're ready, press any key to continue...
-
-
- Please give the full path of your CodeCombat git repository:
- Please enter the full path where you want to install your CodeCombat environment
- This installation requires Git Bash.
- Git bash is by default installed at 'C:\Program Files (x86)\Git'.
- Git bash is by default installed at 'C:\Program Files\Git'.
- Please enter the full path where git bash is installed or just press enter if it's in the default location
- Do you want to checkout the repository via ssh?
-
-
-
- Installing bower, brunch, nodemon and sendwithus...
- Installing bower packages...
- Installing sass...
- Installing npm...
- Starting brunch....
- Setting up a MongoDB database for you...
- Downloading the last version of the CodeCombat database...
-
-
-
- That path already exists, are you sure you want to overwrite it?
- That path doesn't exist. Please try again...
-
-
- The setup of the CodeCombat Dev. Environment was succesfull.
- Thank you already for your contribution and see you soon.
- Do you want to read the README for more information?
-
-
- From now on you can start the dev. environment at
- the touch of a single mouse click.
- 1) Just double click
- and let the environment start up.
- 2) Now just open 'localhost:3000' in your prefered browser.
- That's it, you're now ready to start working on CodeCombat!
-
+
+
+
+ ç¹ä½“ä¸æ–‡
+ Simplified Chinese
+ Before we start the installation, here are some tips:
+ Press any key to exit...
+
+
+ You have choosen ç¹ä½“ä¸æ–‡ as your language.
+ From now on we'll send our feedback in ç¹ä½“ä¸æ–‡.
+
+
+ In order to continue the installation of the developers environment
+ you will have to read and agree with the following license:
+ Have you read the license and do you agree with it?
+ This setup can't happen without an agreement.
+ Installation and Setup of the CodeCombat environment is cancelled.
+
+
+
+ -bit computer detected.
+ The operating system
+ was detected.
+ We don't support Windows XP, installation cancelled.
+
+
+ Have you already installed all the software needed for CodeCombat?
+ We recommand that you reply negative in case you're not sure.
+ Skipping the installation of the software...
+ CodeCombat couldn't be developed without third-party software.
+ That's why you'll need to install this software,
+ in order to start contributing to our community.
+ Cancel the installation if you already have the application.
+ Make sure to select the option that adds the application to your Windows Path, if the option is available.
+ Do you already have the latest version of
+ installed?
+ is downloading...
+ is installing...
+ is unzipping...
+ is cleaning...
+ Please define the full path where mongodb should be installed
+
+
+
+
+ CodeCombat is opensource, like you already know.
+ All our sourcecode can be found online at Github.
+ You can choose to do the entire Git setup yourself.
+ However we recommend that you instead let us handle it instead.
+
+
+ Do you want to do the Local Git setup manually yourself?
+ Make sure you have correctly setup your repository before processing.
+ Do not close this window please.
+ When you're ready, press any key to continue...
+
+
+ Please give the full path of your CodeCombat git repository:
+ Please enter the full path where you want to install your CodeCombat environment
+ This installation requires Git Bash.
+ Git bash is by default installed at 'C:\Program Files (x86)\Git'.
+ Git bash is by default installed at 'C:\Program Files\Git'.
+ Please enter the full path where git bash is installed or just press enter if it's in the default location
+ Do you want to checkout the repository via ssh?
+
+
+ You should have forked CodeCombat to your own GitHub Account by now...
+ Please enter your github information, to configure your local repository.
+ Username:
+ Password:
+ Thank you... Configuring your local repistory right now...
+
+
+
+ The installation of your local environment was succesfull!
+ You can now close this setup.
+ After that, you should open the configuration setup to automaticly configure your environment...
+
+
+ Installing bower, brunch, nodemon and sendwithus...
+ Installing bower packages...
+ Installing sass...
+ Installing npm...
+ Starting brunch....
+ Setting up a MongoDB database for you...
+ Downloading the last version of the CodeCombat database...
+
+ Don't close!
+
+
+ That path already exists, are you sure you want to overwrite it?
+ That path doesn't exist. Please try again...
+
+
+ The setup of the CodeCombat Dev. Environment was succesfull.
+ Thank you already for your contribution and see you soon.
+ Do you want to read the README for more information?
+
+
+ From now on you can start the dev. environment at
+ the touch of a single mouse click.
+ 1) Just double click
+ and let the environment start up.
+ 2) Now just open 'localhost:3000' in your prefered browser.
+ That's it, you're now ready to start working on CodeCombat!
+
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat b/scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat
old mode 100755
new mode 100644
index fe7ffdd8c..6633ba71d
--- a/scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat
@@ -1,5 +1,5 @@
-set /p res="%1 [Y/N]: "
-set "result=unset"
-if "%res%"=="Y" (set "result=true")
-if "%res%"=="y" (set "result=true")
+set /p res="%1 [Y/N]: "
+set "result=unset"
+if "%res%"=="Y" (set "result=true")
+if "%res%"=="y" (set "result=true")
if "%result%"=="unset" (set "result=false")
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/configuration.bat b/scripts/windows/coco-dev-setup/batch/scripts/configuration.bat
new file mode 100755
index 000000000..f70748a7a
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/configuration.bat
@@ -0,0 +1,47 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+call read_cache
+
+call configuration_cmd
+
+call npm_and_brunch_setup
+
+call print_finished_header
+call print_dashed_seperator
+
+call get_local_text end_succesfull end succesfull
+call get_local_text end_thankyou end thankyou
+echo %end_succesfull%
+echo %end_thankyou%
+
+call print_dashed_seperator
+
+call get_local_text start_s1 start s1
+call get_local_text start_s2 start s2
+call get_local_text start_s3 start s3
+call get_local_text start_s4 start s4
+call get_local_text start_s5 start s5
+call get_local_text start_s6 start s6
+
+echo !start_s1!
+echo !start_s2!
+echo.
+echo !start_s3! '!repository_path!\coco\SCOCODE.bat'
+echo !start_s4!
+echo !start_s5!
+echo.
+echo !start_s6!
+
+call print_dashed_seperator
+
+call get_local_text end_readme end readme
+call ask_question "!end_readme!"
+
+if "%result%"=="true" (
+ call open_readme
+)
+
+exit
+
+endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/configuration_cmd.bat b/scripts/windows/coco-dev-setup/batch/scripts/configuration_cmd.bat
new file mode 100755
index 000000000..3c614e671
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/configuration_cmd.bat
@@ -0,0 +1,4 @@
+Color 0A
+mode con: cols=79 lines=55
+
+TITLE CodeCombat.com - Development Environment Installation
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
old mode 100755
new mode 100644
index 8d85be8b1..760b40889
--- a/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
@@ -1,68 +1,141 @@
-set "temp_directory=c:\.coco\"
-set "curl_app=..\utilities\curl.exe"
-set "zu_app=..\utilities\7za.exe"
-
-if NOT exist "%temp_directory%" (
- md %temp_directory%
-)
-
-call get_local_text install_process_prefix install process prefix
-call get_local_text install_process_sufix install process sufix
-
-call ask_question "!install_process_prefix! %1 !install_process_sufix!"
-
-if "%result%"=="true" (
- goto:exit_installation
-)
-
-call print_dashed_seperator
-
-call get_extension %2 download_extension
-call get_local_text install_process_downloading install process downloading
-echo %1 !install_process_downloading!
-set "install_file=!temp_directory!%1.!download_extension!"
-%curl_app% -k %2 -o !install_file!
-
-if "%download_extension%"=="zip" (
- set "package_path=!temp_directory!%1\"
-
- %zu_app% x !install_file! -o!package_path! -y
-
- for /f "delims=" %%a in ('dir !package_path! /on /ad /b') do @set mongodb_original_directory=%%a
-
- call print_dashed_seperator
- goto:get_mongodb_path
-
- :get_mongodb_path
- call get_local_text install_process_mongodbpath install process mongodbpath
- set /p "mongodb_path=!install_process_mongodbpath!: "
- if exist "%mongodb_path%" (
- call get_local_text error_path error path
- call ask_question "!error_path!"
- if "!result!"=="false" (
- call print_dashed_seperator
- goto:get_mongodb_path
- ) else (
- rmdir /s /q %mongodb_path%
- )
- )
- md %mongodb_path%
-
- %systemroot%\System32\xcopy !package_path!!mongodb_original_directory! !mongodb_path! /r /h /s /e /y
- goto:clean_up
-)
-
-call get_local_text install_process_installing install process installing
-echo %1 !install_process_installing!
-echo.
-start /WAIT !install_file!
-goto:clean_up
-
-:clean_up
- call get_local_text install_process_cleaning install process cleaning
- echo %1 !install_process_cleaning!
- rmdir /s /q "!temp_directory!"
- goto:exit_installation
-
-:exit_installation
+<<<<<<< HEAD
+set "temp_directory=c:\.coco\"
+set "curl_app=..\utilities\curl.exe"
+set "zu_app=..\utilities\7za.exe"
+
+if NOT exist "%temp_directory%" (
+ md %temp_directory%
+)
+
+call get_local_text install_process_prefix install process prefix
+call get_local_text install_process_sufix install process sufix
+
+call ask_question "!install_process_prefix! %1 !install_process_sufix!"
+
+if "%result%"=="true" (
+ goto:exit_installation
+)
+
+call print_dashed_seperator
+
+call get_extension %2 download_extension
+call get_local_text install_process_downloading install process downloading
+echo %1 !install_process_downloading!
+set "install_file=!temp_directory!%1.!download_extension!"
+%curl_app% -k %2 -o !install_file!
+
+if "%download_extension%"=="zip" (
+ set "package_path=!temp_directory!%1\"
+
+ %zu_app% x !install_file! -o!package_path! -y
+
+ for /f "delims=" %%a in ('dir !package_path! /on /ad /b') do @set mongodb_original_directory=%%a
+
+ call print_dashed_seperator
+ goto:get_mongodb_path
+
+ :get_mongodb_path
+ call get_local_text install_process_mongodbpath install process mongodbpath
+ set /p "mongodb_path=!install_process_mongodbpath!: "
+ if exist "%mongodb_path%" (
+ call get_local_text error_path error path
+ call ask_question "!error_path!"
+ if "!result!"=="false" (
+ call print_dashed_seperator
+ goto:get_mongodb_path
+ ) else (
+ rmdir /s /q %mongodb_path%
+ )
+ )
+ md %mongodb_path%
+
+ %systemroot%\System32\xcopy !package_path!!mongodb_original_directory! !mongodb_path! /r /h /s /e /y
+ goto:clean_up
+)
+
+call get_local_text install_process_installing install process installing
+echo %1 !install_process_installing!
+echo.
+start /WAIT !install_file!
+goto:clean_up
+
+:clean_up
+ call get_local_text install_process_cleaning install process cleaning
+ echo %1 !install_process_cleaning!
+ rmdir /s /q "!temp_directory!"
+ goto:exit_installation
+
+:exit_installation
+=======
+set "temp_directory=c:\.coco\"
+set "curl_app=..\utilities\curl.exe"
+set "zu_app=..\utilities\7za.exe"
+
+if NOT exist "%temp_directory%" (
+ md %temp_directory%
+)
+
+call get_local_text install_process_prefix install process prefix
+call get_local_text install_process_sufix install process sufix
+
+call ask_question "!install_process_prefix! %1 !install_process_sufix!"
+
+if "%result%"=="true" (
+ goto:exit_installation
+)
+
+call print_dashed_seperator
+
+call get_extension %2 download_extension
+call get_local_text install_process_downloading install process downloading
+echo %1 !install_process_downloading!
+set "install_file=!temp_directory!%1.!download_extension!"
+start /wait cmd.exe /c "TITLE %1 !install_process_downloading! && %curl_app% -k -m 10800 --retry 100 -o !install_file! %2"
+
+if "%download_extension%"=="zip" (
+ set "package_path=!temp_directory!%1\"
+
+ %zu_app% x !install_file! -o!package_path! -y
+
+ for /f "delims=" %%a in ('dir !package_path! /on /ad /b') do @set mongodb_original_directory=%%a
+
+ call print_dashed_seperator
+ goto:get_mongodb_path
+
+ :get_mongodb_path
+ call get_local_text install_process_mongodbpath install process mongodbpath
+ set /p "mongodb_path=!install_process_mongodbpath!: "
+ if exist "%mongodb_path%" (
+ call get_local_text error_path error path
+ call ask_question "!error_path!"
+ if "!result!"=="false" (
+ call print_dashed_seperator
+ goto:get_mongodb_path
+ ) else (
+ rmdir /s /q %mongodb_path%
+ )
+ )
+ md %mongodb_path%
+
+ %systemroot%\System32\xcopy !package_path!!mongodb_original_directory! !mongodb_path! /r /h /s /e /y
+
+ call set_environment_var "!mongodb_path!\bin"
+
+ goto:clean_up
+)
+
+call get_local_text install_process_installing install process installing
+echo %1 !install_process_installing!
+echo.
+start /WAIT !install_file!
+goto:clean_up
+
+:clean_up
+ call get_local_text install_process_cleaning install process cleaning
+ echo %1 !install_process_cleaning!
+ rmdir /s /q "!temp_directory!"
+ goto:exit_installation
+
+:exit_installation
+>>>>>>> 072729acc34123c42250d361955438cfd8c210d7
call print_dashed_seperator
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
old mode 100755
new mode 100644
index 3c5f798fd..f99680802
--- a/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
@@ -1,53 +1,54 @@
-call print_install_header
-call print_dashed_seperator
-
-call get_local_text install_process_sks install process sks
-echo !install_process_sks!
-
-call get_local_text install_process_skq install process skq
-call ask_question "!install_process_skq!"
-
-call print_dashed_seperator
-
-if "%result%"=="true" (
- call get_local_text install_process_skc install process skc
- echo !install_process_skc!
- call print_dashed_seperator
- goto:exit_setup
-)
-
-call get_system_information
-call print_dashed_seperator
-
-if %system_info_os% == XP (
- call get_local_text install_system_xp install system xp
- echo !install_system_xp!
- call print_exit
-)
-
-call get_variables ..\\config\\downloads.coco downloads download_names downloads_count 0 general general
-call get_variables ..\\config\\downloads.coco downloads download_names downloads_count 2 %system_info_os% b%system_info_bit%
-call get_variables ..\\config\\downloads.coco downloads download_names downloads_count 3 general b%system_info_bit%
-
-call get_local_text install_process_s1 install process s1
-call get_local_text install_process_s2 install process s2
-call get_local_text install_process_s3 install process s3
-call get_local_text install_process_s4 install process s4
-call get_local_text install_process_winpath install process winpath
-
-echo !install_process_s1!
-echo !install_process_s2!
-echo !install_process_s3!
-echo !install_process_s4!
-echo.
-echo !install_process_winpath!
-
-call print_dashed_seperator
-
-for /l %%i in (1, 1, !downloads_count!) do (
- call download_and_install_app !download_names[%%i]! !downloads[%%i]!
-)
-
-goto:exit_setup
-
+call print_install_header
+call print_dashed_seperator
+
+call get_local_text install_process_sks install process sks
+echo !install_process_sks!
+
+call get_local_text install_process_skq install process skq
+call ask_question "!install_process_skq!"
+
+call print_dashed_seperator
+
+if "%result%"=="true" (
+ call get_local_text install_process_skc install process skc
+ echo !install_process_skc!
+ call print_dashed_seperator
+ goto:exit_setup
+)
+
+call get_system_information
+call print_dashed_seperator
+
+if %system_info_os% == XP (
+ call get_local_text install_system_xp install system xp
+ echo !install_system_xp!
+ call print_exit
+)
+
+call get_variables ..\\config\\downloads.coco downloads download_names downloads_count 0 general general
+call get_variables ..\\config\\downloads.coco downloads download_names downloads_count 2 %system_info_os% b%system_info_bit%
+call get_variables ..\\config\\downloads.coco downloads download_names downloads_count 3 general b%system_info_bit%
+
+call get_local_text install_process_s1 install process s1
+call get_local_text install_process_s2 install process s2
+call get_local_text install_process_s3 install process s3
+call get_local_text install_process_s4 install process s4
+call get_local_text install_process_winpath install process winpath
+
+echo !install_process_s1!
+echo !install_process_s2!
+echo !install_process_s3!
+echo.
+echo !install_process_s4!
+echo.
+echo !install_process_winpath!
+
+call print_dashed_seperator
+
+for /l %%i in (1, 1, !downloads_count!) do (
+ call download_and_install_app !download_names[%%i]! !downloads[%%i]!
+)
+
+goto:exit_setup
+
:exit_setup
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_array.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_array.bat
old mode 100755
new mode 100644
index a699365ad..a11f2375e
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_array.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_array.bat
@@ -1,6 +1,6 @@
-set "file=%1"
-set /a %3=0
-for /F "usebackq delims=" %%a in ("%file%") do (
- set /A %3+=1
- call set %2[%%%3%%]=%%a
+set "file=%1"
+set /a %3=0
+for /F "usebackq delims=" %%a in ("%file%") do (
+ set /A %3+=1
+ call set %2[%%%3%%]=%%a
)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_cache_var.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_cache_var.bat
new file mode 100755
index 000000000..d7eebbcfe
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_cache_var.bat
@@ -0,0 +1,3 @@
+for /F "delims=" %%F in ('call run_script .\\get_var.ps1 ..\\config\\cache.coco %1') do (
+ set "%1=%%F"
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
old mode 100755
new mode 100644
index 21c975aaf..c335263d6
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
@@ -1,3 +1,3 @@
-for /F "delims=" %%F in ('call run_script .\\get_var.ps1 ..\\config\\config.coco %1') do (
- set "%1=%%F"
+for /F "delims=" %%F in ('call run_script .\\get_var.ps1 ..\\config\\config.coco %1') do (
+ set "%1=%%F"
)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
old mode 100755
new mode 100644
index 2f884b366..1b81e6a0c
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
@@ -1,3 +1,3 @@
-for /F "delims=" %%F in ('call run_script .\\get_var.ps1 ..\\config\\downloads.coco %2 %3 %4 %5') do (
- set "%1=%%F"
+for /F "delims=" %%F in ('call run_script .\\get_var.ps1 ..\\config\\downloads.coco %2 %3 %4 %5') do (
+ set "%1=%%F"
)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
old mode 100755
new mode 100644
index bbcd05b5e..71b381ebb
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
@@ -1,3 +1,3 @@
-for /F "delims=" %%F in ('call run_script .\\get_extension.ps1 %1') do (
- set "%2=%%F"
+for /F "delims=" %%F in ('call run_script .\\get_extension.ps1 %1') do (
+ set "%2=%%F"
)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1 b/scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1
old mode 100755
new mode 100644
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
old mode 100755
new mode 100644
index eb9c88ef5..04f859da8
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
@@ -1,36 +1,39 @@
-echo Some feedback is sent in your system's language
-echo but most feedback is sent and localised by us.
-echo Here is a list of languages:
-call print_dashed_seperator
-
-call get_array ..\\localisation\\languages.coco languages language_count
-for /l %%i in (1,1,%language_count%) do (
- call get_text !languages[%%i]! global_native global native
- echo [%%i] !global_native!
-)
-
-goto:get_localisation_id
-
-:get_localisation_id
- call print_dashed_seperator
- set /p "localisation_id=Enter the language ID of your preference and press : "
- goto:validation_check
-
-:validation_check
- set "localisation_is_false="
- set /a local_id = %localisation_id%
- if !local_id! EQU 0 set localisation_is_false=1
- if !local_id! LSS 1 set localisation_is_false=1
- if !local_id! GTR !language_count! set localisation_is_false=1
- if defined localisation_is_false (
- echo The id you entered is invalid, please try again...
- goto:get_localisation_id
- ) else (
- set language_id=!languages[%local_id%]!
- call get_text !language_id! global_native global native
- call print_dashed_seperator
- echo You have choosen !global_native! as your language.
- call get_text !language_id! global_intro global intro
- echo !global_intro!
- call print_seperator
+echo Some feedback is sent in your system's language
+echo but most feedback is sent and localised by us.
+echo Here is a list of languages:
+call print_dashed_seperator
+
+call get_array ..\\localization\\languages.coco languages language_count
+for /l %%i in (1,1,%language_count%) do (
+ call get_text !languages[%%i]! global_description global description
+ echo [%%i] !global_description!
+)
+
+goto:get_localization_id
+
+:get_localization_id
+ call print_dashed_seperator
+ set /p "localization_id=Enter the language ID of your preference and press : "
+ goto:validation_check
+
+:validation_check
+ set "localization_is_false="
+ set /a local_id = %localization_id%
+ if !local_id! EQU 0 set localization_is_false=1
+ if !local_id! LSS 1 set localization_is_false=1
+ if !local_id! GTR !language_count! set localization_is_false=1
+ if defined localization_is_false (
+ echo The id you entered is invalid, please try again...
+ goto:get_localization_id
+ ) else (
+ set language_id=!languages[%local_id%]!
+ call print_dashed_seperator
+
+ call get_local_text language_choosen language choosen
+ echo !language_choosen!
+
+ call get_local_text language_feedback language feedback
+ echo !language_feedback!
+
+ call print_seperator
)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
old mode 100755
new mode 100644
index 9a54a78c5..aae9bf110
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
@@ -1 +1 @@
-call get_text !language_id! %1 %2 %3 %4 %5
\ No newline at end of file
+call get_text %language_id% %1 %2 %3 %4 %5
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat
old mode 100755
new mode 100644
index 8e2560551..c76707670
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat
@@ -1,10 +1,10 @@
-goto:get_safe_path
-
-:get_safe_path
- set /p "tmp_safe_path=%1"
- if not exist "%tmp_safe_path%" (
- call get_local_text error-exist
- echo !error_exist!
- call print_dashed_seperator
- goto:get_safe_path
+goto:get_safe_path
+
+:get_safe_path
+ set /p "tmp_safe_path=%1"
+ if not exist "%tmp_safe_path%" (
+ call get_local_text error-exist
+ echo !error_exist!
+ call print_dashed_seperator
+ goto:get_safe_path
)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
old mode 100755
new mode 100644
index 908399932..04c66c1a3
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
@@ -1,31 +1,29 @@
-if exist "%PROGRAMFILES(X86)%" (
- call:set_bit 64
-) else (
- call:set_bit 32
-)
-
-for /f "tokens=4-5 delims=. " %%i in ('ver') do set VERSION=%%i.%%j
-if "%version%" == "5.2" ( call:set_os XP )
-if "%version%" == "6.0" ( call:set_os Vista )
-if "%version%" == "6.1" ( call:set_os Win7 )
-:: we handle win8.0 as win7
-if "%version%" == "6.2" ( call:set_os Win7 )
-:: we handle win8.1 as win7
-if "%version%" == "6.3" ( call:set_os Win7 )
-
-goto:end
-
-:set_bit
- call get_local_text install_system_bit install system bit
- set system_info_bit=%~1
- echo %system_info_bit%%install_system_bit%
-goto:eof
-
-:set_os
- set system_info_os=%~1
- call get_local_text install_system_prefix install system prefix
- call get_local_text install_system_sufix install system sufix
- echo %install_system_prefix% %system_info_os% %install_system_sufix%
-goto:eof
-
-:end
+if exist "%PROGRAMFILES(X86)%" (
+ call:set_bit 64
+) else (
+ call:set_bit 32
+)
+
+for /f "tokens=4-5 delims=. " %%i in ('ver') do set VERSION=%%i.%%j
+if "%version%" == "5.2" ( call:set_os XP )
+if "%version%" == "6.0" ( call:set_os Vista )
+if "%version%" == "6.1" ( call:set_os Win7 )
+if "%version%" == "6.2" ( call:set_os Win8 )
+if "%version%" == "6.3" ( call:set_os Win8 )
+
+goto:end
+
+:set_bit
+ call get_local_text install_system_bit install system bit
+ set system_info_bit=%~1
+ echo %system_info_bit%%install_system_bit%
+goto:eof
+
+:set_os
+ set system_info_os=%~1
+ call get_local_text install_system_prefix install system prefix
+ call get_local_text install_system_sufix install system sufix
+ echo %install_system_prefix% %system_info_os% %install_system_sufix%
+goto:eof
+
+:end
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
old mode 100755
new mode 100644
index aacdf94f2..617d5b00a
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
@@ -1,3 +1,3 @@
-for /F "delims=" %%F in ('call run_script .\\get_var.ps1 ..\\localisation\\%1.coco %3 %4 %5 %6') do (
- set "%2=%%F"
+for /F "delims=" %%F in ('call run_script .\\get_var.ps1 ..\\localization\\%1.coco %3 %4 %5 %6') do (
+ set "%2=%%F"
)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1 b/scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1
old mode 100755
new mode 100644
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat
old mode 100755
new mode 100644
index a53805fac..f46c187bc
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat
@@ -1,4 +1,4 @@
-set count=0
-for /F "delims=" %%F in ('call run_script.bat .\\get_variables.ps1 %*') do (
- %%F
+set count=0
+for /F "delims=" %%F in ('call run_script.bat .\\get_variables.ps1 %*') do (
+ %%F
)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1 b/scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1
old mode 100755
new mode 100644
index 6d94b4324..38fa11b7c
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1
@@ -1,33 +1,33 @@
-$xml_file = [xml](get-content $args[0])
-$arr_value = $args[1]
-$arr_name = $args[2]
-$arr_counter = $args[3]
-$counter = $args[4]
-
-if($args.count -eq 6)
-{
- $root = $xml_file.variables.($args[5])
-}
-elseif($args.count -eq 7)
-{
- $root = $xml_file.variables.($args[5]).($args[6])
-}
-elseif($args.count -eq 8)
-{
- $root = $xml_file.variables.($args[5]).($args[6]).($args[7])
-}
-elseif($args.count -eq 9)
-{
- $nodes = $xml_file.variables.($args[5]).($args[6]).($args[7]).($args[8])
-}
-
-foreach ($node in $root.ChildNodes)
-{
- $counter += 1
- $value = $node.InnerText
- $name = $node.Name
- Write-Host set "$arr_value[$counter]=$value"
- Write-Host set "$arr_name[$counter]=$name"
-}
-
+$xml_file = [xml](get-content $args[0])
+$arr_value = $args[1]
+$arr_name = $args[2]
+$arr_counter = $args[3]
+$counter = $args[4]
+
+if($args.count -eq 6)
+{
+ $root = $xml_file.variables.($args[5])
+}
+elseif($args.count -eq 7)
+{
+ $root = $xml_file.variables.($args[5]).($args[6])
+}
+elseif($args.count -eq 8)
+{
+ $root = $xml_file.variables.($args[5]).($args[6]).($args[7])
+}
+elseif($args.count -eq 9)
+{
+ $nodes = $xml_file.variables.($args[5]).($args[6]).($args[7]).($args[8])
+}
+
+foreach ($node in $root.ChildNodes)
+{
+ $counter += 1
+ $value = $node.InnerText
+ $name = $node.Name
+ Write-Host set "$arr_value[$counter]=$value"
+ Write-Host set "$arr_name[$counter]=$name"
+}
+
Write-Host set "$arr_counter=$counter"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
old mode 100755
new mode 100644
index e9add16ca..38234f51b
--- a/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
@@ -1,115 +1,149 @@
-call print_github_header
-call print_dashed_seperator
-
-call get_local_text github_intro_opensource github intro opensource
-call get_local_text github_intro_online github intro online
-call get_local_text github_intro_manual github intro manual
-call get_local_text github_intro_norec github intro norec
-
-echo !github_intro_opensource!
-echo !github_intro_online!
-echo !github_intro_manual!
-echo !github_intro_norec!
-
-call print_dashed_seperator
-
-call get_local_text github_skip_question github skip question
-call ask_question "!github_skip_question!"
-call print_dashed_seperator
-
-if "%result%"=="true" (
- call get_local_text github_skip_consequence github skip consequence
- echo !github_skip_consequence!
-
- call get_local_text github_skip_donotclose github skip donotclose
- echo !github_skip_donotclose!
-
- call get_local_text github_skip_wait github skip wait
- set /p "github_skip_wait=!github_skip_wait!"
-
- call print_dashed_seperator
-
- call get_local_text github_process_path github process path
- call get_path_safe "!github_process_path!"
- set "repository_path=!tmp_safe_path!"
-
- goto:exit_git_setup
-)
-
-goto:get_bash_path
-
-:get_bash_path
- call get_local_text github_process_bashi github process bashi
- echo !github_process_bashi!
-
- if not defined install_system_bit (
- call print_dashed_seperator
- call get_system_information
- call print_dashed_seperator
- )
-
- if "%system_info_bit%"=="64" (
- call get_local_text github_process_bashp64 github process bashp64
- echo !github_process_bashp64!
- ) else (
- call get_local_text github_process_bashp32 github process bashp32
- echo !github_process_bashp32!
- )
-
- call get_local_text github_process_bashq github process bashq
- set /p "git_bash_path=!github_process_bashq!: "
-
- if not defined git_bash_path (
- if "%system_info_bit%"=="64" (
- set "git_bash_path=C:\Program Files (x86)\Git"
- ) else (
- set "git_bash_path=C:\Program Files\Git"
- )
- goto:get_git_path
- )
-
- if not exist "%git_bash_path%" (
- call get_local_text error_exist error exist
- echo !error_exist!
- call print_dashed_seperator
- goto:get_bash_path
- ) else (
- goto:get_git_path
- )
-goto:eof
-
-:get_git_path
- call print_dashed_seperator
- call get_local_text github_process_checkout github process checkout
- set /p "repository_path=!github_process_checkout!: "
- if exist !repository_path! (
- call get_local_text error_path error path
- call ask_question "!error_path!"
- if "!result!"=="false" (
- call print_dashed_seperator
- goto:get_git_path
- ) else (
- rmdir /s /q %repository_path%
- goto:git_checkout
- )
- ) else (
- goto:git_checkout
- )
-goto:eof
-
-:git_checkout
- md "%repository_path%"
- set "repository_path=%repository_path%\coco"
-
- call print_dashed_seperator
- set "git_app_path=%git_bash_path%\bin\git.exe"
-
- call get_config github_url
- "%git_app_path%" clone "!github_url!" "%repository_path%"
-
- goto:exit_git_setup
-goto:eof
-
-:exit_git_setup
- call print_dashed_seperator
+call print_github_header
+call print_dashed_seperator
+
+call get_local_text github_intro_opensource github intro opensource
+call get_local_text github_intro_online github intro online
+call get_local_text github_intro_manual github intro manual
+call get_local_text github_intro_norec github intro norec
+
+echo !github_intro_opensource!
+echo !github_intro_online!
+echo !github_intro_manual!
+echo !github_intro_norec!
+
+call print_dashed_seperator
+
+call get_local_text github_skip_question github skip question
+call ask_question "!github_skip_question!"
+call print_dashed_seperator
+
+if "%result%"=="true" (
+ call get_local_text github_skip_consequence github skip consequence
+ echo !github_skip_consequence!
+
+ call get_local_text github_skip_donotclose github skip donotclose
+ echo !github_skip_donotclose!
+
+ call get_local_text github_skip_wait github skip wait
+ set /p "github_skip_wait=!github_skip_wait!"
+
+ call print_dashed_seperator
+
+ call get_local_text github_process_path github process path
+ call get_path_safe "!github_process_path!"
+ set "repository_path=!tmp_safe_path!"
+
+ goto:exit_git_setup
+)
+
+goto:get_bash_path
+
+:get_bash_path
+ call get_local_text github_process_bashi github process bashi
+ echo !github_process_bashi!
+
+ if not defined install_system_bit (
+ call print_dashed_seperator
+ call get_system_information
+ call print_dashed_seperator
+ )
+
+ if "%system_info_bit%"=="64" (
+ call get_local_text github_process_bashp64 github process bashp64
+ echo !github_process_bashp64!
+ ) else (
+ call get_local_text github_process_bashp32 github process bashp32
+ echo !github_process_bashp32!
+ )
+
+ call get_local_text github_process_bashq github process bashq
+ set /p "git_bash_path=!github_process_bashq!: "
+
+ if not defined git_bash_path (
+ if "%system_info_bit%"=="64" (
+ set "git_bash_path=C:\Program Files (x86)\Git"
+ ) else (
+ set "git_bash_path=C:\Program Files\Git"
+ )
+ goto:get_git_path
+ )
+
+ if not exist "%git_bash_path%" (
+ call get_local_text error_exist error exist
+ echo !error_exist!
+ call print_dashed_seperator
+ goto:get_bash_path
+ ) else (
+ goto:get_git_path
+ )
+goto:eof
+
+:get_git_path
+ call print_dashed_seperator
+ call get_local_text github_process_checkout github process checkout
+ set /p "repository_path=!github_process_checkout!: "
+ if exist !repository_path! (
+ call get_local_text error_path error path
+ call ask_question "!error_path!"
+ if "!result!"=="false" (
+ call print_dashed_seperator
+ goto:get_git_path
+ ) else (
+ rmdir /s /q %repository_path%
+ goto:git_checkout
+ )
+ ) else (
+ goto:git_checkout
+ )
+goto:eof
+
+:git_checkout
+ md "%repository_path%"
+ set "repository_path=%repository_path%"
+
+ call print_dashed_seperator
+ set "git_app_path=%git_bash_path%\bin\git.exe"
+
+ call get_config github_url
+ "%git_app_path%" clone "!github_url!" "%repository_path%\coco"
+
+ goto:git_configuration
+goto:eof
+
+:git_configuration
+ call print_dashed_seperator
+
+ call get_local_text github_config_intro github config intro
+ echo !github_config_intro!
+
+ call get_local_text github_config_info github config info
+ echo !github_config_info!
+
+ call print_dashed_seperator
+
+ call get_local_text github_config_username github config username
+ set /p "git_username=!github_config_username!"
+
+ call get_local_text github_config_password github config password
+
+ set /p "git_password=!github_config_password!"
+
+ call print_dashed_seperator
+
+ call get_local_text github_config_process github config process
+ echo !github_config_process!
+
+ set cur_dir=%CD%
+ cd !repository_path!\coco
+
+ "%git_app_path%" remote rm origin
+ "%git_app_path%" remote add origin https://!git_username!:!git_password!@github.com/!git_username!/codecombat.git
+
+ cd !cur_dir!
+
+ goto:exit_git_setup
+goto:eof
+
+:exit_git_setup
+ call print_dashed_seperator
goto:eof
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/nab_automatic_script.bat b/scripts/windows/coco-dev-setup/batch/scripts/nab_automatic_script.bat
new file mode 100755
index 000000000..7048f0180
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/nab_automatic_script.bat
@@ -0,0 +1,7 @@
+call print_dashed_seperator
+call get_local_text npm_script npm script
+echo %npm_script%
+
+echo start cmd.exe cmd /c "TITLE CodeCombat.com - mongodb database & mongod --setParameter textSearchEnabled=true --dbpath %~2">%~1\SCOCODE.bat
+echo start cmd.exe cmd /c "TITLE CodeCombat.com - nodemon server & nodemon index.js">>%~1\SCOCODE.bat
+echo start cmd.exe cmd /c "TITLE CodeCombat.com - brunch - live compiler & brunch w">>%~1\SCOCODE.bat
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/nab_install_bower.bat b/scripts/windows/coco-dev-setup/batch/scripts/nab_install_bower.bat
new file mode 100755
index 000000000..283d5e522
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/nab_install_bower.bat
@@ -0,0 +1,7 @@
+call print_dashed_seperator
+call get_local_text npm_binstall npm binstall
+echo %npm_binstall%
+
+cd /D %~1
+start /wait cmd /c "echo %npm_binstall% & bower cache clean & bower install"
+cd /D %work_directory%
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/nab_install_mongodb.bat b/scripts/windows/coco-dev-setup/batch/scripts/nab_install_mongodb.bat
new file mode 100755
index 000000000..84d9a3691
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/nab_install_mongodb.bat
@@ -0,0 +1,37 @@
+call print_dashed_seperator
+call get_local_text npm_mongodb npm mongodb
+echo %npm_mongodb%
+
+if exist %~1 (
+ rmdir /s /q %~1
+)
+
+md %~1
+
+call print_dashed_seperator
+call get_local_text npm_db npm db
+echo %npm_db%
+
+call get_config database_backup
+
+call get_local_text npm_close npm close
+
+cd /D %~1
+
+start cmd /c "TITLE MongoDB - %npm_close% & mongod --setParameter textSearchEnabled=true --dbpath %~1"
+
+start /wait cmd.exe /c "TITLE downloading database backup... && %work_directory%\%curl_app% -k -m 10800 --retry 100 -o dump.tar.gz %database_backup%"
+
+start /wait cmd /c "%work_directory%\%zu_app% e dump.tar.gz && del dump.tar.gz && %work_directory%\%zu_app% x dump.tar && del dump.tar"
+
+start /wait cmd /c "mongorestore dump"
+
+rmdir /s /q dump
+
+call %work_directory%\print_dashed_seperator
+
+taskkill /F /fi "IMAGENAME eq mongod.exe"
+
+del /F %~1\mongod.lock
+
+cd /D %work_directory%
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/nab_install_npm.bat b/scripts/windows/coco-dev-setup/batch/scripts/nab_install_npm.bat
new file mode 100755
index 000000000..6c6e5d3c2
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/nab_install_npm.bat
@@ -0,0 +1,6 @@
+call get_local_text npm_install npm install
+echo %npm_install%
+
+cd /D %~1
+start /wait cmd /c "echo %npm_install% & npm install -g bower brunch nodemon sendwithus"
+cd /D %work_directory%
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/nab_install_npm_all.bat b/scripts/windows/coco-dev-setup/batch/scripts/nab_install_npm_all.bat
new file mode 100755
index 000000000..cb858c029
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/nab_install_npm_all.bat
@@ -0,0 +1,7 @@
+call print_dashed_seperator
+call get_local_text npm_npm npm npm
+echo %npm_npm%
+
+cd /D %~1
+start /wait cmd /c "echo %npm_npm% & npm install"
+cd /D %work_directory%
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/nab_install_sass.bat b/scripts/windows/coco-dev-setup/batch/scripts/nab_install_sass.bat
new file mode 100755
index 000000000..6cece7ced
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/nab_install_sass.bat
@@ -0,0 +1,7 @@
+call print_dashed_seperator
+call get_local_text npm_sass npm sass
+echo %npm_sass%
+
+cd /D %~1
+start /wait cmd /c "echo %npm_sass% & gem install sass"
+cd /D %work_directory%
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat
old mode 100755
new mode 100644
index ae3572b36..4f6a7964a
--- a/scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat
@@ -1,89 +1,24 @@
-call print_npm_and_brunch_header
-call print_dashed_seperator
-
-set work_directory=%CD%
-
-set "curl_app=..\utilities\curl.exe"
-set "zu_app=..\utilities\7za.exe"
-set "keystuff=..\utilities\keystuff.exe"
-
-set "coco_root=!repository_path!\coco"
-
-goto:automatic_script
-
-call get_local_text npm-install
-echo !npm_install!
-
-cd !coco_root!
-start /wait cmd /c "echo !npm_install! & npm install -g bower brunch nodemon sendwithus"
-cd !work_directory!
-
-call print_dashed_seperator
-call get_local_text npm-binstall
-echo !npm_binstall!
-
-cd "!coco_root!"
-start /wait cmd /c "echo !npm_binstall! & bower install"
-cd "!work_directory!"
-
-call print_dashed_seperator
-call get_local_text npm-sass
-echo !npm_sass!
-
-cd "!coco_root!"
-start /wait cmd /c "echo !npm_sass! & gem install sass"
-cd "!work_directory!"
-
-call print_dashed_seperator
-call get_local_text npm-npm
-echo !npm_npm!
-
-cd "!coco_root!"
-start /wait cmd /c "echo !npm_npm! & npm install"
-cd "!work_directory!"
-
-:: --- MONGODB
-
-:mongodb
-call print_dashed_seperator
-call get_local_text npm-mongodb
-echo !npm_mongodb!
-
-set "mdb_directory=!repository_path!\cocodb"
-
-if exist mdb_directory (
- rmdir /s /q "!mdb_directory!"
-)
-
-md !mdb_directory!
-
-call print_dashed_seperator
-call get_local_text npm-db
-echo !npm_db!
-
-call get_config database_backup
-
-cd !mdb_directory!
-
-start cmd /c "%work_directory%\%keystuff% Alt-Tab && mongod --setParameter textSearchEnabled=true --dbpath !mdb_directory!"
-
-%curl_app% -k !database_backup! -o dump.tar.gz
-
-start /wait cmd /c "%work_directory%\%keystuff% Alt-Tab && %zu_app% e dump.tar.gz && del dump.tar.gz && %zu_app% x dump.tar && del dump.tar"
-
-start /wait cmd /c "mongorestore dump"
-
-rmdir /s /q db
-
-:: --- AUTOMATIC SCRIPT
-
-::automatic_script
-call print_dashed_seperator
-call get_local_text npm-script
-echo !npm_script!
-
-:: --- END
-
-call print_dashed_seperator
-
-pause
\ No newline at end of file
+call print_npm_and_brunch_header
+call print_dashed_seperator
+
+set work_directory=%CD%
+
+set "curl_app=..\utilities\curl.exe"
+set "zu_app=..\utilities\7za.exe"
+
+set coco_root=%repository_path%\coco
+set coco_db=%repository_path%\cocodb
+
+call nab_install_npm %coco_root%
+
+call nab_install_bower %coco_root%
+
+call nab_install_sass %coco_root%
+
+call nab_install_npm_all %coco_root%
+
+call nab_install_mongodb %coco_db%
+
+call nab_automatic_script.bat %coco_root% %coco_db%
+
+call print_dashed_seperator
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/open_localized_text_file.bat b/scripts/windows/coco-dev-setup/batch/scripts/open_localized_text_file.bat
new file mode 100755
index 000000000..bee9f5dd6
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/open_localized_text_file.bat
@@ -0,0 +1,6 @@
+set "LFTP=%1-%language_id%.coco"
+if not exist "%LFTP%" (
+ call open_text_file %1.coco
+) else (
+ call open_text_file %LFTP%
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat b/scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat
old mode 100755
new mode 100644
index 484f3dd75..730a3f577
--- a/scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat
@@ -1 +1 @@
-call open_text_file ..\\config\\readme.coco
\ No newline at end of file
+call open_localized_text_file ..\\config\\localized\\readme
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat b/scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat
old mode 100755
new mode 100644
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
old mode 100755
new mode 100644
index 727d7e61c..cf1c60ada
--- a/scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
@@ -1,3 +1,3 @@
-echo.
-echo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+echo.
+echo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
echo.
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
old mode 100755
new mode 100644
index 6f1051cc6..107790d88
--- a/scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
@@ -1,2 +1,3 @@
-set /p res="Press any key to exit..."
+call get_local_text global_exit global exit
+set /p res="%global_exit%"
exit
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_file.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_file.bat
old mode 100755
new mode 100644
index f40867969..de46b68ee
--- a/scripts/windows/coco-dev-setup/batch/scripts/print_file.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_file.bat
@@ -1,4 +1,4 @@
-set "file=%1"
-for /f "usebackq tokens=* delims=;" %%a in ("%file%") do (
- echo.%%a
+set "file=%1"
+for /f "usebackq tokens=* delims=;" %%a in ("%file%") do (
+ echo.%%a
)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat
old mode 100755
new mode 100644
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat
old mode 100755
new mode 100644
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_header.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_header.bat
old mode 100755
new mode 100644
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_info.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_info.bat
old mode 100755
new mode 100644
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat
old mode 100755
new mode 100644
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_license.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_license.bat
old mode 100755
new mode 100644
index a208ca559..3acee4bcc
--- a/scripts/windows/coco-dev-setup/batch/scripts/print_license.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_license.bat
@@ -1 +1 @@
-print_file ..\\config\\license.coco
\ No newline at end of file
+call print_localized_file ..\\config\\localized\\license
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_localized_file.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_localized_file.bat
new file mode 100755
index 000000000..e71fe3364
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_localized_file.bat
@@ -0,0 +1,6 @@
+set "LFTP=%1-%language_id%.coco"
+if not exist "%LFTP%" (
+ call print_file %1.coco
+) else (
+ call print_file %LFTP%
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat
old mode 100755
new mode 100644
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
old mode 100755
new mode 100644
index c68792d46..50f484b80
--- a/scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
@@ -1,3 +1,3 @@
-echo.
-echo -----------------------------------------------------------------------------
+echo.
+echo -------------------------------------------------------------------------------
echo.
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat
old mode 100755
new mode 100644
index c00833574..0a2e3033a
--- a/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat
@@ -1 +1 @@
-print_file ..\\config\\tips.coco
\ No newline at end of file
+call print_localized_file ..\\config\\localized\\tips
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/read_cache.bat b/scripts/windows/coco-dev-setup/batch/scripts/read_cache.bat
new file mode 100755
index 000000000..13f96330d
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/read_cache.bat
@@ -0,0 +1,2 @@
+call get_cache_var language_id
+call get_cache_var repository_path
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat b/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat
old mode 100755
new mode 100644
index 1e4797008..c18af72b7
--- a/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat
@@ -1,2 +1,2 @@
-@echo off
+@echo off
PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& "%*"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/set_environment_var.bat b/scripts/windows/coco-dev-setup/batch/scripts/set_environment_var.bat
new file mode 100755
index 000000000..05d5362a5
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/set_environment_var.bat
@@ -0,0 +1 @@
+setx path ";%~1"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat
old mode 100755
new mode 100644
index 7c137563f..fe24e6855
--- a/scripts/windows/coco-dev-setup/batch/scripts/setup.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat
@@ -1,67 +1,29 @@
-@echo off
-setlocal EnableDelayedExpansion
-
-Color 0A
-mode con: cols=79 lines=55
-
-call print_header
-call print_dashed_seperator
-
-call get_config.bat version
-call get_config.bat author
-call get_config.bat copyright
-echo Welcome to the automated Installation of the CodeCombat Dev. Environment!
-echo v%version% authored by %author% and published by %copyright%.
-call print_seperator
-
-echo Before we start the installation, here are some tips:
-call print_tips
-call print_seperator
-
-call sign_license
-
-call get_language
-
-call download_and_install_applications
-
-call github_setup
-
-:: This will be available in v2.0
-::call npm_and_brunch_setup
-
-call print_finished_header
-call print_dashed_seperator
-
-call get_local_text end_succesfull end succesfull
-call get_local_text end_thankyou end thankyou
-echo %end_succesfull%
-echo %end_thankyou%
-
-call print_dashed_seperator
-
-call get_local_text start_s1 start s1
-call get_local_text start_s2 start s2
-call get_local_text start_s3 start s3
-call get_local_text start_s4 start s4
-call get_local_text start_s5 start s5
-call get_local_text start_s6 start s6
-
-echo !start_s1!
-echo !start_s2!
-echo.
-echo !start_s3! '!repository_path!\coco\SCOCODE.bat'
-echo !start_s4!
-echo !start_s5!
-echo.
-echo !start_s6!
-
-call print_dashed_seperator
-
-call get_local_text end_readme end readme
-call ask_question "!end_readme!"
-
-if "%result%"=="true" (
- call open_readme
-)
-
+@echo off
+setlocal EnableDelayedExpansion
+
+call configuration_cmd
+
+call print_header
+call print_dashed_seperator
+
+call get_config.bat version
+call get_config.bat author
+call get_config.bat copyright
+echo Welcome to the automated Installation of the CodeCombat Dev. Environment!
+echo v%version% authored by %author% and published by %copyright%.
+call print_seperator
+
+call get_language
+
+call get_local_text global_tips global tips
+echo !global_tips!
+call print_tips
+call print_seperator
+
+call sign_license
+
+call download_and_install_applications
+
+start cmd /c "setup_p2.bat"
+
endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/setup_p2.bat b/scripts/windows/coco-dev-setup/batch/scripts/setup_p2.bat
new file mode 100755
index 000000000..f6e0d3b21
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/setup_p2.bat
@@ -0,0 +1,20 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+call configuration_cmd
+
+call github_setup
+
+call write_cache
+
+call get_local_text switch_install switch install
+call get_local_text switch_close switch close
+call get_local_text switch_open switch open
+
+echo %switch_install%
+echo %switch_close%
+echo.
+
+set /p "dummy=%switch_open%"
+
+endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat b/scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
old mode 100755
new mode 100644
index 139ddfd80..a3d3a3f3f
--- a/scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
@@ -1,15 +1,27 @@
-echo In order to continue the installation of the developers environment
-echo you will have to read and agree with the following license:
-call print_dashed_seperator
-
-call print_license
-call print_dashed_seperator
-
-call ask_question "Have you read the license and do you agree with it?"
-call print_dashed_seperator
-
-if "%result%"=="false" (
- echo This setup can't happen without an agreement.
- echo Installation and Setup of the CodeCombat environment is cancelled.
- call print_exit
+call get_local_text license_s1 license s1
+echo !license_s1!
+
+call get_local_text license_s2 license s2
+echo !license_s2!
+
+call print_dashed_seperator
+
+call print_license
+call print_dashed_seperator
+
+call get_local_text license_q1 license q1
+call ask_question "%license_q1%"
+
+call print_dashed_seperator
+
+if "%result%"=="false" (
+ call get_local_text license_a1 license a1
+ echo !license_a1!
+
+ call get_local_text license_a2 license a2
+ echo !license_a2!
+
+ echo.
+
+ call print_exit
)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/write_cache.bat b/scripts/windows/coco-dev-setup/batch/scripts/write_cache.bat
new file mode 100755
index 000000000..2e46ca4c3
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/write_cache.bat
@@ -0,0 +1,10 @@
+set "cache=..\\config\\cache.coco"
+
+echo ^>%cache%
+
+echo ^>>%cache%
+
+echo ^%language_id%^ >>%cache%
+echo ^%repository_path%^ >>%cache%
+
+echo ^ >>%cache%
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/setup.bat b/scripts/windows/coco-dev-setup/batch/setup.bat
old mode 100755
new mode 100644
index aa57d4523..1246a77c1
--- a/scripts/windows/coco-dev-setup/batch/setup.bat
+++ b/scripts/windows/coco-dev-setup/batch/setup.bat
@@ -1,2 +1,2 @@
-cd scripts
+cd scripts
setup.bat
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/setup.exe b/scripts/windows/coco-dev-setup/batch/setup.exe
new file mode 100755
index 000000000..f36e70dfa
Binary files /dev/null and b/scripts/windows/coco-dev-setup/batch/setup.exe differ
diff --git a/scripts/windows/coco-dev-setup/last_step_succesfull/config.coco b/scripts/windows/coco-dev-setup/last_step_succesfull/config.coco
deleted file mode 100755
index ae8c66f56..000000000
--- a/scripts/windows/coco-dev-setup/last_step_succesfull/config.coco
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- 1.0
- GlenDC
- CodeCombat.com © 2013-2014
-
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/last_step_succesfull/downloads.coco b/scripts/windows/coco-dev-setup/last_step_succesfull/downloads.coco
deleted file mode 100755
index 2a0472c41..000000000
--- a/scripts/windows/coco-dev-setup/last_step_succesfull/downloads.coco
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- http://nodejs.org/dist/v0.10.25/node-v0.10.25-x86.msi
- http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p353.exe?direct
- http://www.python.org/ftp/python/2.7.6/python-2.7.6.msi
-
-
- http://nodejs.org/dist/v0.10.25/x64/node-v0.10.25-x64.msi
- http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p353-x64.exe?direct
- http://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi
-
- https://msysgit.googlecode.com/files/Git-1.8.5.2-preview20131230.exe
-
-
- mongodb=http://fastdl.mongodb.org/win32/mongodb-win32-i386-2.5.4.zip
- mongodb=http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-2.5.4.zip
-
-
- mongodb=http://fastdl.mongodb.org/win32/mongodb-win32-i386-2.5.4.zip
- mongodb=http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2.5.4.zip
-
-
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/last_step_succesfull/en.coco b/scripts/windows/coco-dev-setup/last_step_succesfull/en.coco
deleted file mode 100755
index a2e1f9fca..000000000
--- a/scripts/windows/coco-dev-setup/last_step_succesfull/en.coco
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
- English
- Bye Bye!
-
-
- Installation has begun, this can take a while... Please stay tuned...
- Don't close any windows please, unless specified explicitly.
-
-
- [DOWNLOADING AND INSTALLING 3RD PARTY SOFTWARE]
- downloading:
- installing:
- Download and Installation cancelled...
- Software has been installed...
- Installation of the Developers Environment is complete!
- Installation has been stopped...
- unpacking and moving:
- Installing bower, brunch, nodemon and sendwithus...
-
-
- CodeCombat is safely stored on a git repository.
- Therefore you need a git command-line application (Git-bash).
- Examples: git-bash, CygWin, ...
- Do you already have git-bash?
- Enter the path to where you installed Git-bash
- Checking out the Git Repository...
- Please enter your github username:
-
-
- Do you already have the latest version of node-js installed?
- Please enter the full path of the location you installed nodejs to:
-
-
- Do you already have the latest version of ruby installed?
-
-
- Do you already have the latest version of mongo-db installed?
- Enter the path where you would like to install MongoDB:
-
-
- Do you already have the latest version of python installed?
-
-
- Sadly we can't support Windows XP... Please upgrade your OS!
- Machine OS cannot be determined...
- Report your OS to the developers @ CodeCombat.com...
- ... Cleaning up has been disabled... Terminating Script!
- The path to your git application is incorrect, please try again...
- The path you entered is invalid, please try again...
-
-
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/last_step_succesfull/get_config.bat b/scripts/windows/coco-dev-setup/last_step_succesfull/get_config.bat
deleted file mode 100755
index 3849e22c2..000000000
--- a/scripts/windows/coco-dev-setup/last_step_succesfull/get_config.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-powershell .\get_var.ps1 config.coco %1 > var.tmp
-set /p %1= < var.tmp
-del /q var.tmp
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/last_step_succesfull/get_download.bat b/scripts/windows/coco-dev-setup/last_step_succesfull/get_download.bat
deleted file mode 100755
index fde3799e3..000000000
--- a/scripts/windows/coco-dev-setup/last_step_succesfull/get_download.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@ECHO off
-powershell .\get_var.ps1 downloads.coco %2 %3 %4 %5 %6 > var.tmp
-set /p %1= < var.tmp
-del /q var.tmp
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/last_step_succesfull/get_text.bat b/scripts/windows/coco-dev-setup/last_step_succesfull/get_text.bat
deleted file mode 100755
index 5cae1d431..000000000
--- a/scripts/windows/coco-dev-setup/last_step_succesfull/get_text.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@ECHO off
-powershell .\get_var.ps1 %1.coco %3 %4 %5 %6 %7 > var.tmp
-set /p %2= < var.tmp
-del /q var.tmp
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/last_step_succesfull/get_var.ps1 b/scripts/windows/coco-dev-setup/last_step_succesfull/get_var.ps1
deleted file mode 100755
index 77573929f..000000000
--- a/scripts/windows/coco-dev-setup/last_step_succesfull/get_var.ps1
+++ /dev/null
@@ -1,17 +0,0 @@
-$xml_file = [xml](get-content $args[0])
-if($args.count -eq 2)
-{
- $xml_file.variables.($args[1])
-}
-elseif($args.count -eq 3)
-{
- $xml_file.variables.($args[1]).($args[2])
-}
-elseif($args.count -eq 4)
-{
- $xml_file.variables.($args[1]).($args[2]).($args[3])
-}
-elseif($args.count -eq 5)
-{
- $xml_file.variables.($args[1]).($args[2]).($args[3]).($args[4])
-}
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/last_step_succesfull/run_script.bat b/scripts/windows/coco-dev-setup/last_step_succesfull/run_script.bat
deleted file mode 100755
index dfc6e6cc0..000000000
--- a/scripts/windows/coco-dev-setup/last_step_succesfull/run_script.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-powershell "& "%*"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat b/scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat
deleted file mode 100755
index 97e7d1ee2..000000000
--- a/scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat
+++ /dev/null
@@ -1,533 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-
-Color 0A
-
-mode con: cols=78 lines=60
-
-:: Global Variables
-set "temp-dir=C:\Coco-Temp"
-set install-log=%temp-dir%\coco-dev-install-log.txt
-
-:: set correct curl app
-IF EXIST "%PROGRAMFILES(X86)%" (
- (set "curl-app=utilities\curl\64bit\curl.exe")
-) ELSE (
- set "curl-app=utilities\curl\32bit\curl.exe"
-)
-
-set "ZU-app=utilities\7za.exe"
-
-:: BUGS:
- :: + DEBUG ALL STEPS UNTILL NOW DONE
-
-
-:: TODO:
-:: + Write code to install vs if it's not yet installed on users pc
-
-:: + Configuraton and installation checklist:
-:: 1) cd codecombat
-:: 2) npm install -g bower brunch nodemon sendwithus
-:: 3) bower install
-:: 4) gem install sass
-:: 5) npm install
-:: 6) brunch -w
-:: Extra... @ Fail run npm install
-
-:: + Copy the automated dev batch file to root folder
-:: => Let user define mongo-db directory
-:: + Start the dev environment
-
-:: Create The Temporary Directory
-IF EXIST %temp-dir% rmdir %temp-dir% /s /q
-mkdir %temp-dir%
-
-:: Create Log File
-copy /y nul %install-log% > nul
-
-call:parse_aa_and_draw "config\header"
-call:draw_dss
-
-call:parse_file_new "config\config" cnfg n
-
-call:log "Welcome to the automated Installation of the CodeCombat Dev. Environment!"
-call:log_sse "v%%cnfg[1]%% authored by %%cnfg[2]%% and published by %%cnfg[3]%%."
-
-:: Language Agreement Stuff
-
-call:log "In order to continue the installation of the developers environment"
-call:log "you will have to read and agree with the following license:
-call:draw_dss
-echo.
-call:parse_aa_and_draw "license.txt"
-echo.
-call:draw_dss
-call:strict_user_yn_question "Have you read the license and do you agree with it?"
-
-if "%res%"=="false" (
- call:log "Sorry to hear that, have a good day..."
- call:log_sse "Installation and Setup of the CodeCombat environment is cancelled."
- GOTO:END
-)
-
-:: Tips
-call:log "Before we start the installation, here are some tips:"
-echo.
-
-call:parse_aa_and_draw "config\tips"
-
-call:draw_ss
-
-:: Read Language Index
-call:parse_file_new "localisation\languages" lang lang_c
-
-:: Read Download URLs
-call:parse_file_new "config\downloads" downloads n
-call:parse_file_new "config\downloads_32" downloads_32 n
-call:parse_file_new "config\downloads_64" downloads_64 n
-call:parse_file_new "config\downloads_vista_32" downloads_vista_32 n
-call:parse_file_new "config\downloads_vista_64" downloads_vista_64 n
-call:parse_file_new "config\downloads_7_32" downloads_7_32 n
-call:parse_file_new "config\downloads_7_64" downloads_7_64 n
-
-:: Parse all Localisation Files
-for /L %%i in (1,1,%lang_c%) do (
- call:parse_file "localisation\%%lang[%%i]%%" languages languages_c
-)
-
-set /A "wc = %languages_c% / %lang_c%"
-
-:: Start install with language question (Localisation)
-call:log "Which language do you prefer?"
-
-set /A c=0
-for /L %%i in (1,%wc%,%languages_c%) do (
- set /A "n = %%i - 1"
- call:log " [%%c%%] %%languages[%%i]%%"
- set /A c+=1
-)
-
-set "lang_id=-1"
-call:user_enter_language_id
-goto:user_pick_language
-
-:user_enter_language_id
- set /p lang_id= "Enter the language ID and press : "
-goto:eof
-
-:user_pick_language
- set res=false
- if %lang_id% LSS 0 set res=true
- if %lang_id% GEQ %lang_c% set res=true
- if "%res%"=="true" (
- call:log "Invalid id! Please enter a correct id from the numbers listed above..."
- call:draw_dss
- call:user_enter_language_id
- goto:user_pick_language
- )
-
-call:get_lw word 0
-call:log_ds "You choose '%word%', from now on all feedback will be logged in it."
-
-call:log_lw 1
-call:log_lw_sse 2
-
-:: downloads for all version...
-
-:: [TODO] The choice between Cygwin && Git ?! Is => HAVE EXTERNAL GIT APPLICATION LIST!!!
-
-call:log_lw_sse 3
-
-call:log_lw 6
-call:log_lw 7
-call:log_lw 8
-call:install_software_o "git" "%%downloads[1]%%" exe 9
-call:draw_dss
-call:get_lw word 11
-
-:: [TODO] Add downloads for windows visual studio ?!
-
-call:user_set_git_path
-
-:user_set_git_path_fail
- if not exist "%git_exe_path%" (
- call:log_lw 27
- call:draw_dss
- call:user_set_git_path
- )
- :: architecture specific downloads...
- IF EXIST "%PROGRAMFILES(X86)%" (GOTO 64BIT) ELSE (GOTO 32BIT)
-goto:eof
-
-:user_set_git_path
- set /p git_exe_path="%word%: "
- call:user_set_git_path_fail
-goto:eof
-
-:go_to_platform
- call:log_ds "Windows %~1 detected..."
- GOTO %~2
-goto:eof
-
-:64BIT
- call:log_ds "64-bit computer detected..."
-
- call:install_software_o "node-js" "%%downloads_64[1]%%" msi 12
- call:draw_dss
-
- call:get_path_from_user 41 42
- set "node_js_path=%user_tmp_path%"
- Call:draw_dss
-
- call:install_software_o "ruby" "%%downloads_64[2]%%" exe 13
- call:draw_dss
- call:install_software_o "python" "%%downloads_64[3]%%" msi 26
-
- :: Some installations require specific windows versions
- for /f "tokens=4-5 delims=. " %%i in ('ver') do set VERSION=%%i.%%j
- if "%version%" == "5.2" ( call:go_to_platform "XP" ver_XP_64 )
- if "%version%" == "6.0" ( call:go_to_platform "Vista" ver_Vista_64 )
- if "%version%" == "6.1" ( call:go_to_platform "7" ver_Win7_8_64 )
- if "%version%" == "6.2" ( call:go_to_platform "8.0" ver_Win7_8_64 )
- if "%version%" == "6.3" ( call:go_to_platform "8.1" ver_Win7_8_64 )
- GOTO warn_and_exit
-GOTO END
-
-:32BIT
- call:log_ds "32-bit computer detected..."
-
- call:install_software_o "node-js" "%%downloads_32[1]%%" msi 12
- call:draw_dss
-
- call:get_path_from_user 41 42
- set "node_js_path=%user_tmp_path%"
- Call:draw_dss
-
- call:install_software_o "ruby" "%%downloads_32[2]%%" exe 13
- call:draw_dss
- call:install_software_o "python" "%%downloads_32[3]%%" msi 26
-
- :: Some installations require specific windows versions
- for /f "tokens=4-5 delims=. " %%i in ('ver') do set VERSION=%%i.%%j
- if "%version%" == "5.2" ( call:go_to_platform "XP" ver_XP_32 )
- if "%version%" == "6.0" ( call:go_to_platform "Vista" ver_Vista_32 )
- if "%version%" == "6.1" ( call:go_to_platform "7" ver_Win7_8_32 )
- if "%version%" == "6.2" ( call:go_to_platform "8.0" ver_Win7_8_32 )
- if "%version%" == "6.3" ( call:go_to_platform "8.1" ver_Win7_8_32 )
- GOTO warn_and_exit
-GOTO END
-
-:ver_Win7_8_32
- call:install_packed_software_o "mongo-db" "%%downloads_7_32[1]%%" 25 14
- set "mong-db-path = %packed_software_path%"
-goto git_rep_checkout
-
-:ver_Vista_32
- call:install_packed_software_o "mongo-db" "%%downloads_vista_32[1]%%" 25 14
- set "mong-db-path = %packed_software_path%"
-goto git_rep_checkout
-
-:ver_XP_32
- call:log_lw_ds 15
-goto END
-
-:ver_Win7_8_64
- call:install_packed_software_o "mongo-db" "%%downloads_7_64[1]%%" 25 14
- set "mong-db-path = %packed_software_path%"
-goto git_rep_checkout
-
-:ver_Vista_64
- call:install_packed_software_o "mongo-db" "%%downloads_vista_64[1]%%" 25 14
- set "mong-db-path = %packed_software_path%"
-goto git_rep_checkout
-
-:ver_XP_64
- call:log_lw_ds 15
-goto END
-
-:git_rep_checkout
- call:log_lw_ss 16
- call:log_lw_sse 17
-
- set "PATH=%PATH%;%git_exe_path%\bin;%git_exe_path%\cmd" /M
-
- call:log_lw 36
- call:log_lw 37
- call:log_lw 38
-
- call:draw_dss
-
- call:get_lw word 39
- set /p git_username="%word% "
-
- call:draw_dss
-
- call:get_empty_path_from_user 32
- set "git_repository_path=%user_tmp_path%"
-
-goto:git_rep_checkout_auto
-
-:git_rep_checkout_auto
- git clone https://github.com/%git_username%/codecombat.git "%git_repository_path%"
-goto:git_repo_configuration
-
-:git_repo_configuration
- call:log_lw_ss 35
- call:log_lw_sse 36
-
- SET "PATH=%PATH%;%node_js_path%" /M
- setx -m git "%git_exe_path%\bin"
-
- call:log_lw 40
- start cmd /k "npm install -g bower brunch nodemon sendwithus & exit"
-
-goto report_ok
-
-:report_ok
- call:log_lw 18
- call:log_lw_sse 19
-
- :: Open README file
- call:open_readme
-
-goto clean_up
-
-:open_readme
- call:open_txt_file "config/info"
-goto:eof
-
-:warn_and_exit
- call:log_lw_ss 20
- call:log_lw_sse 21
-goto error_report
-
-:error_report
- call:log_lw_ds 22
-goto END
-
-:clean_up
- call:log_lw_sse 23
- rmdir %temp-dir% /s /q
-goto END
-
-:: ============================ INSTALL SOFTWARE FUNCTIONS ======================
-
-:download_software
- call:get_lw word 4
- call:log "%word% %~1..."
- %curl-app% -sS -k %~2 -o %temp-dir%\%~1-setup.%~3
-goto:eof
-
-:install_software
- call:download_software %~1 %~2 %~3
- call:get_lw word 5
- call:log "%word% %~1..."
- START /WAIT %temp-dir%\%~1-setup.%~3
-goto:eof
-
-:install_software_o
- call:get_lw word %~4
- call:user_yn_question "%word%"
- if "%res%"=="true" (
- call:install_software %~1 %~2 %~3
- ) else (
- call:log_lw 10
- )
-goto:eof
-
-:install_packed_software
- call:download_software %~1 %~2 zip
-
- call:draw_dss
-
- call:get_lw word %~3
-
- set /p packed_software_path="%word% "
-
- :: remove chosen directory of user if it already exists (to prevent a window from popping up)
- IF EXIST %packed_software_path% rmdir %packed_software_path% /s /q
-
- %ZU-app% x %temp-dir%\%~1-setup.zip -o%packed_software_path%
-
- call:draw_dss
-
- for /f "delims=" %%a in ('dir "%packed_software_path%\" /on /ad /b') do @set temp_dir=%%a
- for /f "delims=" %%a in ('dir "%packed_software_path%\%temp_dir%\" /on /ad /b') do (
- xcopy %packed_software_path%\%temp_dir% %packed_software_path%\ /S /E
- )
-
- call:draw_dss
- rmdir %packed_software_path%\%temp_dir%\ /s /q
-goto:eof
-
-:user_yn_question
- set /p result="%~1 [Y/N]: "
- call:draw_dss
- set "res=false"
- if "%result%"=="N" (set "res=true")
- if "%result%"=="n" (set "res=true")
-goto:eof
-
-:strict_user_yn_question
- set /p result="%~1 [Y/N]: "
- call:draw_dss
- set "res=unset"
- if "%result%"=="N" (set "res=false")
- if "%result%"=="n" (set "res=false")
- if "%result%"=="Y" (set "res=true")
- if "%result%"=="y" (set "res=true")
-
- if "%res%"=="unset" (
- call:log "Please answer the question with either Y or N..."
- call:draw_dss
- call:strict_user_yn_question "%~1"
- )
-goto:eof
-
-:install_packed_software_o
- call:get_lw word %~4
- call:user_yn_question "%word%"
- if "%res%"=="true" (
- call:install_packed_software %~1 %~2 %~3
- ) else (
- call:log_lw 10
- )
-goto:eof
-
-:: ===================== USER - INTERACTION - FUNCTIONS ========================
-
-:get_path_from_user
- call:get_lw word %~1
- set /p user_tmp_path="%word% "
- if not exist "%user_tmp_path%" (
- call:log_lw 43
- call:draw_dss
- call:get_path_from_user %~1 %~2
- )
-goto:eof
-
-:get_empty_path_from_user
- call:get_lw word %~1
- set /p user_tmp_path="%word% "
- if exist "%user_tmp_path%" (
- call:log_lw 33
- call:draw_dss
- call:get_path_from_user %~1
- )
-goto:eof
-
-:: ============================== FUNCTIONS ====================================
-
-:log
- echo %~1
- echo %~1 >> %install-log%
-goto:eof
-
-:draw_ss
- echo.
- call:log "-----------------------------------------------------------------------------"
- echo.
-goto:eof
-
-:draw_dss
- echo.
- call:log "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
- echo.
-goto:eof
-
-:draw_seperator
- echo.
- echo + + + + + + + +
- echo.
-goto:eof
-
-:log_ss
- call:draw_ss
- call:log "%~1"
-goto:eof
-
-:log_sse
- call:log "%~1"
- call:draw_ss
-goto:eof
-
-:log_ds
- call:log_ss "%~1"
- call:draw_ss
-goto:eof
-
-:: ============================== IO FUNCTIONS ====================================
-
-:open_txt_file
- start "" notepad.exe %~1
-goto:eof
-
-:parse_aa_and_draw
- set "file=%~1"
- for /f "usebackq tokens=* delims=;" %%a in ("%file%") do (
- echo.%%a
- )
-goto:eof
-
-:parse_file
- set "file=%~1"
- for /F "usebackq delims=" %%a in ("%file%") do (
- set /A %~3+=1
- call set %~2[%%%~3%%]=%%a
- )
-goto:eof
-
-:parse_file_new
- set /A %~3=0
- call:parse_file %~1 %~2 %~3
-goto:eof
-
-:: ============================== LOCALISATION FUNCTIONS ================
-
-:get_lw
- call:get_lw_id %~1 %lang_id% %~2
-goto:eof
-
-:get_lw_id
- set /A count = %~2 * %wc% + %~3 + 1
- set "%~1=!languages[%count%]!"
-goto:eof
-
-:log_lw
- call:get_lw str %~1
- call:log "%str%"
-goto:eof
-
-:log_lw_prfx
- call:get_lw str %~1
- call:log "%~2%str%"
-goto:eof
-
-:log_lw_ss
- call:get_lw str %~1
- call:log_ss "%str%"
-goto:eof
-
-:log_lw_ds
- call:get_lw str %~1
- call:log_ds "%str%"
-goto:eof
-
-:log_lw_sse
- call:get_lw str %~1
- call:log_sse "%str%"
-goto:eof
-
-:: ============================== WINDOWS FUNCTIONS ======================
-
-:set_env_var
- setx -m %~1 %~2
-goto:eof
-
-:: ============================== EOF ====================================
-
-:END
- exit
-goto:eof
-
-endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/recycle_bin/git-test.bat b/scripts/windows/coco-dev-setup/recycle_bin/git-test.bat
deleted file mode 100755
index adee59c3e..000000000
--- a/scripts/windows/coco-dev-setup/recycle_bin/git-test.bat
+++ /dev/null
@@ -1,50 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-
-:: + Configuraton and installation checklist:
-:: 1) cd codecombat
-:: 2) npm install -g bower brunch nodemon sendwithus
-:: 3) bower install
-:: 4) gem install sass
-:: 5) npm install
-:: 6) brunch -w
-:: Extra... @ Fail run npm install
-
-echo "Moving to your git repository..."
-C:
-cd C:\CodeCombat
-
-PAUSE
-
-SET "PATH=%PATH%;C:\Program Files\Nodejs" /M
-setx -m git "C:\Program Files (x86)\Git\bin"
-SET "PATH=%PATH%;C:\Program Files (x86)\Git\bin;C:\Program Files (x86)\Git\cmd" /M
-
-PAUSE
-
-echo "Installing bower, brunch, nodemon and sendwithus..."
-start cmd /k "npm install -g bower brunch nodemon sendwithus & exit"
-
-PAUSE
-
-echo "running npm install..."
-start cmd /k "npm install & exit"
-
-PAUSE
-
-echo "Activating bower install..."
-start cmd /k "bower install & PAUSE & exit"
-
-PAUSE
-
-echo "Installing sass via gem..."
-start cmd /k "install sass & PAUSE & exit"
-
-PAUSE
-
-echo "comping repository via brunch..."
-start cmd /k "brunch -w & exit"
-
-PAUSE
-
-endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/src/get_category.cpp b/scripts/windows/coco-dev-setup/src/get_category.cpp
deleted file mode 100755
index 971c3aefb..000000000
--- a/scripts/windows/coco-dev-setup/src/get_category.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-#include "stdafx.h"
-#include
-#include
-#include
-#include
-#include
-
-#define tstring std::wstring
-#define tcout std::wcout
-
-static const tstring DEF_URL = L"http://www.google.com";
-
-int ErrorReport(const tstring & str, int value = 0)
-{
- tcout << str.c_str();
- return value;
-}
-
-void GetHashInfo(tstring id, std::vector & info) {
- while(id.size() > 0)
- {
- size_t pos = id.find(L'-');
-
- tstring substr =
- id.substr(0, pos == tstring::npos ? id.length() : pos);
- info.push_back(substr);
-
- if(pos == tstring::npos) id = L"";
- else
- {
- ++pos;
- id = id.substr(pos, id.length() - pos);
- }
- }
-}
-
-void SetArrayVariable(
- const tstring & name,
- int id,
- const tstring & line
- )
-{
- tcout << L"set \"";
- tcout << name;
- tcout << L"[" << id << "]";
- tcout << L"=" << line;
- tcout << L"\"" << std::endl;
-}
-
-void FillArray(
- const std::vector & info,
- const tstring & name,
- const tstring & id_array_name,
- const tstring & file,
- int & id
- )
-{
- if(info.size() == 0) return;
-
- auto it = info.begin();
- size_t indention = 0;
- unsigned int nlc = 0;
-
- std::wifstream infile(file.c_str(), std::ifstream::in);
-
- if(!infile)
- {
- #ifdef _DEBUG
- tcout << file.c_str() << std::endl;
- tcout << strerror(errno) << std::endl;
- #endif
- return;
- }
-
- tstring line;
- int counter = 1;
- while (std::getline(infile, line))
- {
- size_t cpos = line.find('[');
- if(cpos == tstring::npos)
- {
- cpos = line.find_first_not_of(L" \t\r\n");
- }
- if(nlc++ == 0 || cpos == indention)
- {
- indention = cpos;
- if(it == info.end())
- {
- size_t pos = line.find(L'=') + 1;
- SetArrayVariable(
- name, id,
- line.substr(pos, line.size() - pos)
- );
- SetArrayVariable(
- id_array_name, id++,
- line.substr(cpos, pos - 3)
- );
- ++counter;
- }
- else if(line.find(*it) != tstring::npos)
- {
- ++it;
- nlc = 0;
- }
- }
- else if(counter > 1)
- {
- return;
- }
- }
-
- infile.close();
- return;
-}
-
-int _tmain(int argc, _TCHAR* argv[])
-{
- if(argc == 1)
- return ErrorReport(L"Please specify a localisation file.");
- else if(argc == 2)
- return ErrorReport(L"Please specify the name of the array.");
- else if(argc == 3)
- return ErrorReport(L"Please specify the name of the name-array.");
- else if(argc == 4)
- return ErrorReport(L"Please specify the counter parameter.");
- else if(argc == 5)
- return ErrorReport(L"Please specify one or more categories you are looking for.");
-
- tstring file, name, counter_name, id_array_name;
- file = argv[1];
- name = argv[2];
- id_array_name = argv[3];
- counter_name = argv[4];
- int id = 1;
-
- for(int i = 5 ; i < argc ; ++i)
- {
- std::vector information;
- GetHashInfo(argv[i], information);
- FillArray(information, name, id_array_name, file, id);
- }
-
- tcout << L"set \"" << counter_name << L"=" << (id - 1) << L"\"";
-
- return 0;
-}
diff --git a/scripts/windows/coco-dev-setup/src/get_extension.cpp b/scripts/windows/coco-dev-setup/src/get_extension.cpp
deleted file mode 100755
index f311ac93f..000000000
--- a/scripts/windows/coco-dev-setup/src/get_extension.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "stdafx.h"
-#include
-#include
-#include
-#include
-#include
-
-#define tstring std::wstring
-#define tcout std::wcout
-
-int ErrorReport(const tstring & str, int value = 0)
-{
- tcout << str.c_str();
- return value;
-}
-
-int _tmain(int argc, _TCHAR* argv[])
-{
- if(argc == 1)
- return ErrorReport(L"Please specify a download URL.");
- if(argc == 2)
- return ErrorReport(L"Please specify a name for your variable.");
-
- tstring url, name, extension;
- url = argv[1];
- name = argv[2];
-
- if(url.find(L"exe") != tstring::npos) extension = L"exe";
- else if(url.find(L"msi") != tstring::npos) extension = L"msi";
- else if(url.find(L"zip") != tstring::npos) extension = L"zip";
-
- tcout << L"set \"" << name << L"=";
- tcout << extension << L"\"";
-
- return 0;
-}
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/src/get_var.cpp b/scripts/windows/coco-dev-setup/src/get_var.cpp
deleted file mode 100755
index e69b0be1c..000000000
--- a/scripts/windows/coco-dev-setup/src/get_var.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include "stdafx.h"
-#include
-#include
-#include
-#include
-#include
-
-#define tstring std::wstring
-#define tcout std::wcout
-
-static const tstring DEF_URL = L"http://www.google.com";
-
-int ErrorReport(const tstring & str, int value = 0)
-{
- tcout << str.c_str();
- return value;
-}
-
-void GetHashInfo(tstring id, std::vector & info) {
- while(id.size() > 0)
- {
- size_t pos = id.find(L'-');
-
- tstring substr =
- id.substr(0, pos == tstring::npos ? id.length() : pos);
- info.push_back(substr);
-
- if(pos == tstring::npos) id = L"";
- else
- {
- ++pos;
- id = id.substr(pos, id.length() - pos);
- }
- }
-}
-
-std::wstring GetText(const std::vector & info, const tstring & file)
-{
- if(info.size() == 0) return L"Info Size is 0.";
-
- auto it = info.begin();
- auto last = info.end() - 1;
- size_t indention = 0;
- unsigned int nlc = 0;
-
- std::wifstream infile(file.c_str(), std::ifstream::in);
-
- if(!infile)
- {
- #ifdef _DEBUG
- tcout << file.c_str() << std::endl;
- tcout << strerror(errno) << std::endl;
- #endif
- return L"File couldn't be opened.";
- }
-
- tstring line;
- while (std::getline(infile, line))
- {
- size_t cpos = line.find('[');
- if(nlc++ == 0 || cpos == indention)
- {
- indention = cpos;
- if(line.find(*it) != tstring::npos)
- {
- if(it == last)
- {
- size_t pos = line.find(L'=') + 1;
- infile.close();
- return line.substr(pos, line.size() - pos);
- }
- else
- {
- ++it;
- nlc = 0;
- }
- }
- }
- }
-
- infile.close();
- return L"Var couldn't be found.";
-}
-
-int _tmain(int argc, _TCHAR* argv[])
-{
- if(argc == 1)
- return ErrorReport(L"Please specify a localisation file.");
- else if(argc == 2)
- return ErrorReport(L"Please specify the ID you are looking for.");
-
- tstring file, hash;
- file = argv[1];
- hash = argv[2];
-
- std::vector information;
- GetHashInfo(hash, information);
-
- size_t size = information.size();
- for(unsigned int i = 0 ; i < size ; ++i)
- {
- tcout << information[i];
- if(i != size - 1) tcout << L"_";
- }
- tcout << L"=" << GetText(information, file);
-
- return 0;
-}
diff --git a/server/articles/Article.coffee b/server/articles/Article.coffee
index 19a1e3253..626fc779c 100644
--- a/server/articles/Article.coffee
+++ b/server/articles/Article.coffee
@@ -1,12 +1,11 @@
mongoose = require('mongoose')
plugins = require('../plugins/plugins')
-ArticleSchema = new mongoose.Schema(
- body: String,
-)
+ArticleSchema = new mongoose.Schema(body: String, {strict:false})
ArticleSchema.plugin(plugins.NamedPlugin)
ArticleSchema.plugin(plugins.VersionedPlugin)
ArticleSchema.plugin(plugins.SearchablePlugin, {searchable: ['body', 'name']})
+ArticleSchema.plugin(plugins.PatchablePlugin)
module.exports = mongoose.model('article', ArticleSchema)
diff --git a/server/articles/article_handler.coffee b/server/articles/article_handler.coffee
index b519b8b9f..8aa2d26dc 100644
--- a/server/articles/article_handler.coffee
+++ b/server/articles/article_handler.coffee
@@ -4,8 +4,13 @@ Handler = require('../commons/Handler')
ArticleHandler = class ArticleHandler extends Handler
modelClass: Article
editableProperties: ['body', 'name', 'i18n']
+ jsonSchema: require '../../app/schemas/models/article'
hasAccess: (req) ->
req.method is 'GET' or req.user?.isAdmin()
+ hasAccessToDocument: (req, document, method=null) ->
+ return true if req.method is 'GET' or method is 'get' or req.user?.isAdmin()
+ return false
+
module.exports = new ArticleHandler()
diff --git a/server/commons/Handler.coffee b/server/commons/Handler.coffee
index f38885fd9..81293b4ad 100644
--- a/server/commons/Handler.coffee
+++ b/server/commons/Handler.coffee
@@ -3,6 +3,9 @@ mongoose = require('mongoose')
Grid = require 'gridfs-stream'
errors = require './errors'
log = require 'winston'
+Patch = require '../patches/Patch'
+User = require '../users/User'
+sendwithus = require '../sendwithus'
PROJECT = {original:1, name:1, version:1, description: 1, slug:1, kind: 1}
FETCH_LIMIT = 200
@@ -20,15 +23,14 @@ module.exports = class Handler
hasAccessToDocument: (req, document, method=null) ->
return true if req.user?.isAdmin()
if @modelClass.schema.uses_coco_permissions
- return document.hasPermissionsForMethod(req.user, method or req.method)
+ return document.hasPermissionsForMethod?(req.user, method or req.method)
return true
formatEntity: (req, document) -> document?.toObject()
getEditableProperties: (req, document) ->
props = @editableProperties.slice()
isBrandNew = req.method is 'POST' and not req.body.original
- if isBrandNew
- props = props.concat @postEditableProperties
+ props = props.concat @postEditableProperties if isBrandNew
if @modelClass.schema.uses_coco_permissions
# can only edit permissions if this is a brand new property,
@@ -37,8 +39,8 @@ module.exports = class Handler
if isBrandNew or isOwner or req.user?.isAdmin()
props.push 'permissions'
- if @modelClass.schema.uses_coco_versions
- props.push 'commitMessage'
+ props.push 'commitMessage' if @modelClass.schema.uses_coco_versions
+ props.push 'allowPatches' if @modelClass.schema.is_patchable
props
@@ -48,6 +50,7 @@ module.exports = class Handler
sendMethodNotAllowed: (res) -> errors.badMethod(res)
sendBadInputError: (res, message) -> errors.badInput(res, message)
sendDatabaseError: (res, err) ->
+ return @sendError(res, err.code, err.response) if err.response and err.code
log.error "Database error, #{err}"
errors.serverError(res, 'Database error, ' + err)
@@ -82,6 +85,7 @@ module.exports = class Handler
@sendSuccess(res, documents)
getById: (req, res, id) ->
+ # return @sendNotFoundError(res) # for testing
return @sendUnauthorizedError(res) unless @hasAccess(req)
@getDocumentForIdOrSlug id, (err, document) =>
@@ -92,8 +96,63 @@ module.exports = class Handler
getByRelationship: (req, res, args...) ->
# this handler should be overwritten by subclasses
+ if @modelClass.schema.is_patchable
+ return @getPatchesFor(req, res, args[0]) if req.route.method is 'get' and args[1] is 'patches'
+ return @setWatching(req, res, args[0]) if req.route.method is 'put' and args[1] is 'watch'
return @sendNotFoundError(res)
+ getNamesByIDs: (req, res) ->
+ ids = req.query.ids or req.body.ids
+ if @modelClass.schema.uses_coco_versions
+ return @getNamesByOriginals(req, res)
+ @getPropertiesFromMultipleDocuments res, User, "name", ids
+
+ getNamesByOriginals: (req, res) ->
+ ids = req.query.ids or req.body.ids
+ ids = ids.split(',') if _.isString ids
+ ids = _.uniq ids
+
+ project = {name:1, original:1}
+ sort = {'version.major':-1, 'version.minor':-1}
+
+ makeFunc = (id) =>
+ (callback) =>
+ criteria = {original:mongoose.Types.ObjectId(id)}
+ @modelClass.findOne(criteria, project).sort(sort).exec (err, document) ->
+ return done(err) if err
+ callback(null, document?.toObject() or null)
+
+ funcs = {}
+ for id in ids
+ return errors.badInput(res, "Given an invalid id: #{id}") unless Handler.isID(id)
+ funcs[id] = makeFunc(id)
+
+ async.parallel funcs, (err, results) ->
+ return errors.serverError err if err
+ res.send (d for d in _.values(results) when d)
+ res.end()
+
+ getPatchesFor: (req, res, id) ->
+ query = { 'target.original': mongoose.Types.ObjectId(id), status: req.query.status or 'pending' }
+ Patch.find(query).sort('-created').exec (err, patches) =>
+ return @sendDatabaseError(res, err) if err
+ patches = (patch.toObject() for patch in patches)
+ @sendSuccess(res, patches)
+
+ setWatching: (req, res, id) ->
+ @getDocumentForIdOrSlug id, (err, document) =>
+ return @sendUnauthorizedError(res) unless @hasAccessToDocument(req, document, 'get')
+ return @sendDatabaseError(res, err) if err
+ return @sendNotFoundError(res) unless document?
+ watchers = document.get('watchers') or []
+ me = req.user.get('_id')
+ watchers = (l for l in watchers when not l.equals(me))
+ watchers.push me if req.body.on and req.body.on isnt 'false'
+ document.set 'watchers', watchers
+ document.save (err, document) =>
+ return @sendDatabaseError(res, err) if err
+ @sendSuccess(res, @formatEntity(req, document))
+
search: (req, res) ->
unless @modelClass.schema.uses_coco_search
return @sendNotFoundError(res)
@@ -141,8 +200,6 @@ module.exports = class Handler
aggregate = $match: query
@modelClass.aggregate(aggregate).project(selectString).limit(FETCH_LIMIT).sort(sort).exec (err, results) =>
return @sendDatabaseError(res, err) if err
- for doc in results
- return @sendUnauthorizedError(res) unless @hasAccessToDocument(req, doc)
res.send(results)
res.end()
@@ -203,12 +260,14 @@ module.exports = class Handler
return @sendBadInputError(res, 'No input.') if _.isEmpty(req.body)
return @sendBadInputError(res, 'id should not be included.') if req.body._id
return @sendUnauthorizedError(res) unless @hasAccess(req)
- validation = @validateDocumentInput(req.body)
- return @sendBadInputError(res, validation.errors) unless validation.valid
document = @makeNewInstance(req)
@saveChangesToDocument req, document, (err) =>
+ return @sendBadInputError(res, err.errors) if err?.valid is false
return @sendDatabaseError(res, err) if err
@sendSuccess(res, @formatEntity(req, document))
+ @onPostSuccess(req, document)
+
+ onPostSuccess: (req, doc) ->
###
TODO: think about pulling some common stuff out of postFirstVersion/postNewVersion
@@ -220,13 +279,11 @@ module.exports = class Handler
return @sendBadInputError(res, 'No input.') if _.isEmpty(req.body)
return @sendBadInputError(res, 'id should not be included.') if req.body._id
return @sendUnauthorizedError(res) unless @hasAccess(req)
- validation = @validateDocumentInput(req.body)
- return @sendBadInputError(res, validation.errors) unless validation.valid
document = @makeNewInstance(req)
document.set('original', document._id)
document.set('creator', req.user._id)
@saveChangesToDocument req, document, (err) =>
- return @sendBadInputError(res, err.response) if err?.response
+ return @sendBadInputError(res, err.errors) if err?.valid is false
return @sendDatabaseError(res, err) if err
@sendSuccess(res, @formatEntity(req, document))
@@ -245,8 +302,6 @@ module.exports = class Handler
return @sendBadInputError(res, 'This entity is not versioned') unless @modelClass.schema.uses_coco_versions
return @sendBadInputError(res, 'No input.') if _.isEmpty(req.body)
return @sendUnauthorizedError(res) unless @hasAccess(req)
- validation = @validateDocumentInput(req.body)
- return @sendBadInputError(res, validation.errors) unless validation.valid
@getDocumentForIdOrSlug req.body._id, (err, parentDocument) =>
return @sendBadInputError(res, 'Bad id.') if err and err.name is 'CastError'
return @sendDatabaseError(res, err) if err
@@ -261,6 +316,8 @@ module.exports = class Handler
delete updatedObject[prop]
delete updatedObject._id
major = req.body.version?.major
+ validation = @validateDocumentInput(updatedObject)
+ return @sendBadInputError(res, validation.errors) unless validation.valid
done = (err, newDocument) =>
return @sendDatabaseError(res, err) if err
@@ -268,6 +325,7 @@ module.exports = class Handler
newDocument.save (err) =>
return @sendDatabaseError(res, err) if err
@sendSuccess(res, @formatEntity(req, newDocument))
+ @notifyWatchersOfChange(req.user, newDocument, req.body.editPath) if @modelClass.schema.is_patchable
if major?
parentDocument.makeNewMinorVersion(updatedObject, major, done)
@@ -275,15 +333,38 @@ module.exports = class Handler
else
parentDocument.makeNewMajorVersion(updatedObject, done)
+ notifyWatchersOfChange: (editor, changedDocument, editPath) ->
+ watchers = changedDocument.get('watchers') or []
+ watchers = (w for w in watchers when not w.equals(editor.get('_id')))
+ return unless watchers.length
+ User.find({_id:{$in:watchers}}).select({email:1, name:1}).exec (err, watchers) =>
+ for watcher in watchers
+ @notifyWatcherOfChange editor, watcher, changedDocument, editPath
+
+ notifyWatcherOfChange: (editor, watcher, changedDocument, editPath) ->
+ context =
+ email_id: sendwithus.templates.change_made_notify_watcher
+ recipient:
+ address: watcher.get('email')
+ name: watcher.get('name')
+ email_data:
+ doc_name: changedDocument.get('name') or '???'
+ submitter_name: editor.get('name') or '???'
+ doc_link: if editPath then "http://codecombat.com#{editPath}" else null
+ commit_message: changedDocument.get('commitMessage')
+ sendwithus.api.send context, (err, result) ->
+
makeNewInstance: (req) ->
- new @modelClass({})
+ model = new @modelClass({})
+ model.set 'watchers', [req.user.get('_id')] if @modelClass.schema.is_patchable
+ model
validateDocumentInput: (input) ->
tv4 = require('tv4').tv4
res = tv4.validateMultiple(input, @jsonSchema)
res
- @isID: (id) -> _.isString(id) and id.length is 24 and id.match(/[a-z0-9]/gi)?.length is 24
+ @isID: (id) -> _.isString(id) and id.length is 24 and id.match(/[a-f0-9]/gi)?.length is 24
getDocumentForIdOrSlug: (idOrSlug, done) ->
idOrSlug = idOrSlug+''
@@ -324,3 +405,17 @@ module.exports = class Handler
return done(validation) unless validation.valid
document.save (err) -> done(err)
+
+ getPropertiesFromMultipleDocuments: (res, model, properties, ids) ->
+ query = model.find()
+ ids = ids.split(',') if _.isString ids
+ ids = _.uniq ids
+ for id in ids
+ return errors.badInput(res, "Given an invalid id: #{id}") unless Handler.isID(id)
+ query.where({'_id': { $in: ids} })
+ query.select(properties).exec (err, documents) ->
+ dict = {}
+ _.each documents, (document) ->
+ dict[document.id] = document
+ res.send dict
+ res.end()
diff --git a/server/commons/database.coffee b/server/commons/database.coffee
index 6356fe7dd..d664725c0 100644
--- a/server/commons/database.coffee
+++ b/server/commons/database.coffee
@@ -15,7 +15,7 @@ module.exports.connect = () ->
module.exports.generateMongoConnectionString = ->
- if config.mongo.mongoose_replica_string
+ if not testing and config.mongo.mongoose_replica_string
address = config.mongo.mongoose_replica_string
else
dbName = config.mongo.db
@@ -25,4 +25,4 @@ module.exports.generateMongoConnectionString = ->
address = config.mongo.username + ":" + config.mongo.password + "@" + address
address = "mongodb://#{address}/#{dbName}"
- return address
\ No newline at end of file
+ return address
diff --git a/server/commons/mail.coffee b/server/commons/mail.coffee
index 117f10bd7..96bb56e2d 100644
--- a/server/commons/mail.coffee
+++ b/server/commons/mail.coffee
@@ -2,14 +2,10 @@ config = require '../../server_config'
module.exports.MAILCHIMP_LIST_ID = 'e9851239eb'
module.exports.MAILCHIMP_GROUP_ID = '4529'
-module.exports.MAILCHIMP_GROUP_MAP =
- announcement: 'Announcements'
- tester: 'Adventurers'
- level_creator: 'Artisans'
- developer: 'Archmages'
- article_editor: 'Scribes'
- translator: 'Diplomats'
- support: 'Ambassadors'
+
+# these two need to be parallel
+module.exports.MAILCHIMP_GROUPS = ['Announcements', 'Adventurers', 'Artisans', 'Archmages', 'Scribes', 'Diplomats', 'Ambassadors']
+module.exports.NEWS_GROUPS = ['generalNews', 'adventurerNews', 'artisanNews', 'archmageNews', 'scribeNews', 'diplomatNews', 'ambassadorNews']
nodemailer = require 'nodemailer'
module.exports.transport = nodemailer.createTransport "SMTP",
diff --git a/server/commons/mapping.coffee b/server/commons/mapping.coffee
index 2f659811b..3cfcc2164 100644
--- a/server/commons/mapping.coffee
+++ b/server/commons/mapping.coffee
@@ -6,23 +6,10 @@ module.exports.handlers =
'level_feedback': 'levels/feedbacks/level_feedback_handler'
'level_session': 'levels/sessions/level_session_handler'
'level_system': 'levels/systems/level_system_handler'
+ 'patch': 'patches/patch_handler'
'thang_type': 'levels/thangs/thang_type_handler'
'user': 'users/user_handler'
-module.exports.schemas =
- 'article': 'articles/article_schema'
- 'common': 'commons/schemas'
- 'i18n': 'commons/i18n_schema'
- 'level': 'levels/level_schema'
- 'level_component': 'levels/components/level_component_schema'
- 'level_feedback': 'levels/feedbacks/level_feedback_schema'
- 'level_session': 'levels/sessions/level_session_schema'
- 'level_system': 'levels/systems/level_system_schema'
- 'metaschema': 'commons/metaschema'
- 'thang_component': 'levels/thangs/thang_component_schema'
- 'thang_type': 'levels/thangs/thang_type_schema'
- 'user': 'users/user_schema'
-
module.exports.routes =
[
'routes/auth'
diff --git a/server/commons/queue.coffee b/server/commons/queue.coffee
index 64b71ae64..0703427d4 100644
--- a/server/commons/queue.coffee
+++ b/server/commons/queue.coffee
@@ -250,7 +250,7 @@ class MongoQueue extends events.EventEmitter
@emit 'error',err,data
else
@emit 'update',err,data
- log.info "The message visibility time was updated"
+ #log.info "The message visibility time was updated"
callback? err, data
diff --git a/server/levels/Level.coffee b/server/levels/Level.coffee
index c61245ed5..9cadeac7b 100644
--- a/server/levels/Level.coffee
+++ b/server/levels/Level.coffee
@@ -1,6 +1,6 @@
mongoose = require('mongoose')
plugins = require('../plugins/plugins')
-jsonschema = require('./level_schema')
+jsonschema = require('../../app/schemas/models/level')
LevelSchema = new mongoose.Schema({
description: String
@@ -10,6 +10,7 @@ LevelSchema.plugin(plugins.NamedPlugin)
LevelSchema.plugin(plugins.PermissionsPlugin)
LevelSchema.plugin(plugins.VersionedPlugin)
LevelSchema.plugin(plugins.SearchablePlugin, {searchable: ['name', 'description']})
+LevelSchema.plugin(plugins.PatchablePlugin)
LevelSchema.pre 'init', (next) ->
return next() unless jsonschema.properties?
diff --git a/server/levels/components/LevelComponent.coffee b/server/levels/components/LevelComponent.coffee
index 3dc373be1..6c1a58370 100644
--- a/server/levels/components/LevelComponent.coffee
+++ b/server/levels/components/LevelComponent.coffee
@@ -1,16 +1,17 @@
mongoose = require('mongoose')
plugins = require('../../plugins/plugins')
-jsonschema = require('./level_component_schema')
+jsonschema = require('../../../app/schemas/models/level_component')
LevelComponentSchema = new mongoose.Schema {
description: String
system: String
}, {strict: false}
-LevelComponentSchema.plugin(plugins.NamedPlugin)
-LevelComponentSchema.plugin(plugins.PermissionsPlugin)
-LevelComponentSchema.plugin(plugins.VersionedPlugin)
-LevelComponentSchema.plugin(plugins.SearchablePlugin, {searchable: ['name', 'description', 'system']})
+LevelComponentSchema.plugin plugins.NamedPlugin
+LevelComponentSchema.plugin plugins.PermissionsPlugin
+LevelComponentSchema.plugin plugins.VersionedPlugin
+LevelComponentSchema.plugin plugins.SearchablePlugin, {searchable: ['name', 'description', 'system']}
+LevelComponentSchema.plugin plugins.PatchablePlugin
LevelComponentSchema.pre 'init', (next) ->
return next() unless jsonschema.properties?
diff --git a/server/levels/components/level_component_handler.coffee b/server/levels/components/level_component_handler.coffee
index 89a3ea21c..3bcc572d0 100644
--- a/server/levels/components/level_component_handler.coffee
+++ b/server/levels/components/level_component_handler.coffee
@@ -3,6 +3,7 @@ Handler = require('../../commons/Handler')
LevelComponentHandler = class LevelComponentHandler extends Handler
modelClass: LevelComponent
+ jsonSchema: require '../../../app/schemas/models/level_component'
editableProperties: [
'system'
'description'
diff --git a/server/levels/feedbacks/LevelFeedback.coffee b/server/levels/feedbacks/LevelFeedback.coffee
index 0eecdec32..5fef6a567 100644
--- a/server/levels/feedbacks/LevelFeedback.coffee
+++ b/server/levels/feedbacks/LevelFeedback.coffee
@@ -2,7 +2,7 @@
mongoose = require('mongoose')
plugins = require('../../plugins/plugins')
-jsonschema = require('./level_feedback_schema')
+jsonschema = require('../../../app/schemas/models/level_feedback')
LevelFeedbackSchema = new mongoose.Schema({
created:
diff --git a/server/levels/feedbacks/level_feedback_handler.coffee b/server/levels/feedbacks/level_feedback_handler.coffee
index 5cb8be50b..58d268db1 100644
--- a/server/levels/feedbacks/level_feedback_handler.coffee
+++ b/server/levels/feedbacks/level_feedback_handler.coffee
@@ -4,6 +4,7 @@ Handler = require('../../commons/Handler')
class LevelFeedbackHandler extends Handler
modelClass: LevelFeedback
editableProperties: ['rating', 'review', 'level', 'levelID', 'levelName']
+ jsonSchema: require '../../../app/schemas/models/level_feedback'
makeNewInstance: (req) ->
feedback = super(req)
diff --git a/server/levels/level_handler.coffee b/server/levels/level_handler.coffee
index ad26fe0e1..27c5f0042 100644
--- a/server/levels/level_handler.coffee
+++ b/server/levels/level_handler.coffee
@@ -5,9 +5,10 @@ SessionHandler = require('./sessions/level_session_handler')
Feedback = require('./feedbacks/LevelFeedback')
Handler = require('../commons/Handler')
mongoose = require('mongoose')
-
+async = require 'async'
LevelHandler = class LevelHandler extends Handler
modelClass: Level
+ jsonSchema: require '../../app/schemas/models/level'
editableProperties: [
'description'
'documentation'
@@ -37,8 +38,8 @@ LevelHandler = class LevelHandler extends Handler
return @getLeaderboardFacebookFriends(req, res, args[0]) if args[1] is 'leaderboard_facebook_friends'
return @getLeaderboardGPlusFriends(req, res, args[0]) if args[1] is 'leaderboard_gplus_friends'
return @getHistogramData(req, res, args[0]) if args[1] is 'histogram_data'
-
- return @sendNotFoundError(res)
+ return @checkExistence(req, res, args[0]) if args[1] is 'exists'
+ super(arguments...)
fetchLevelByIDAndHandleErrors: (id, req, res, callback) ->
@getDocumentForIdOrSlug id, (err, level) =>
@@ -62,7 +63,7 @@ LevelHandler = class LevelHandler extends Handler
# TODO: generalize this for levels based on their teams
else if level.get('type') is 'ladder'
sessionQuery.team = 'humans'
-
+
Session.findOne(sessionQuery).exec (err, doc) =>
return @sendDatabaseError(res, err) if err
return @sendSuccess(res, doc) if doc?
@@ -87,6 +88,7 @@ LevelHandler = class LevelHandler extends Handler
access:'write'
}
]
+ initVals.codeLanguage = req.user.get('aceConfig')?.language ? 'javascript'
session = new Session(initVals)
session.save (err) =>
@@ -106,7 +108,7 @@ LevelHandler = class LevelHandler extends Handler
query = Level.findOne(findParameters)
.select(selectString)
.lean()
-
+
query.exec (err, level) =>
return @sendDatabaseError(res, err) if err
return @sendNotFoundError(res) unless level?
@@ -115,22 +117,38 @@ LevelHandler = class LevelHandler extends Handler
original: level.original.toString()
majorVersion: level.version.major
creator: req.user._id+''
-
+
query = Session.find(sessionQuery).select('-screenshot')
query.exec (err, results) =>
if err then @sendDatabaseError(res, err) else @sendSuccess res, results
-
+
getHistogramData: (req, res,slug) ->
query = Session.aggregate [
{$match: {"levelID":slug, "submitted": true, "team":req.query.team}}
{$project: {totalScore: 1, _id: 0}}
]
-
+
query.exec (err, data) =>
if err? then return @sendDatabaseError res, err
valueArray = _.pluck data, "totalScore"
@sendSuccess res, valueArray
-
+
+ checkExistence: (req, res, slugOrID) ->
+ findParameters = {}
+ if Handler.isID slugOrID
+ findParameters["_id"] = slugOrID
+ else
+ findParameters["slug"] = slugOrID
+ selectString = 'original version.major permissions'
+ query = Level.findOne(findParameters)
+ .select(selectString)
+ .lean()
+
+ query.exec (err, level) =>
+ return @sendDatabaseError(res, err) if err
+ return @sendNotFoundError(res) unless level?
+ res.send({"exists":true})
+ res.end()
getLeaderboard: (req, res, id) ->
sessionsQueryParameters = @makeLeaderboardQueryParameters(req, id)
@@ -138,7 +156,7 @@ LevelHandler = class LevelHandler extends Handler
sortParameters =
"totalScore": req.query.order
selectProperties = ['totalScore', 'creatorName', 'creator']
-
+
query = Session
.find(sessionsQueryParameters)
.limit(req.query.limit)
@@ -203,7 +221,7 @@ LevelHandler = class LevelHandler extends Handler
userMap[u._id] = u[serviceProperty] for u in userResults
session[serviceProperty] = userMap[session.creator] for session in sessionResults
res.send(sessionResults)
-
+
getRandomSessionPair: (req, res, slugOrID) ->
findParameters = {}
if Handler.isID slugOrID
@@ -218,36 +236,34 @@ LevelHandler = class LevelHandler extends Handler
query.exec (err, level) =>
return @sendDatabaseError(res, err) if err
return @sendNotFoundError(res) unless level?
-
+
sessionsQueryParameters =
level:
original: level.original.toString()
majorVersion: level.version.major
submitted:true
-
- console.log sessionsQueryParameters
-
-
- query = Session
- .find(sessionsQueryParameters)
- .select('team')
- .lean()
-
- query.exec (err, resultSessions) =>
- return @sendDatabaseError res, err if err? or not resultSessions
-
- teamSessions = _.groupBy resultSessions, 'team'
- console.log teamSessions
- sessions = []
- numberOfTeams = 0
- for team of teamSessions
- numberOfTeams += 1
- sessions.push _.sample(teamSessions[team])
- if numberOfTeams != 2 then return @sendDatabaseError res, "There aren't sessions of 2 teams, so cannot choose random opponents!"
-
- @sendSuccess res, sessions
-
-
+
+ query = Session.find(sessionsQueryParameters).distinct("team")
+ query.exec (err, teams) =>
+ return @sendDatabaseError res, err if err? or not teams
+ findTop20Players = (sessionQueryParams, team, cb) ->
+ sessionQueryParams["team"] = team
+ Session.aggregate [
+ {$match: sessionQueryParams}
+ {$project: {"totalScore":1}}
+ {$sort: {"totalScore":-1}}
+ {$limit: 20}
+ ], cb
+
+ async.map teams, findTop20Players.bind(@, sessionsQueryParameters), (err, map) =>
+ if err? then return @sendDatabaseError(res, err)
+ sessions = []
+ for mapItem in map
+ sessions.push _.sample(mapItem)
+ if map.length != 2 then return @sendDatabaseError res, "There aren't sessions of 2 teams, so cannot choose random opponents!"
+ @sendSuccess res, sessions
+
+
getFeedback: (req, res, id) ->
return @sendNotFoundError(res) unless req.user
@fetchLevelByIDAndHandleErrors id, req, res, (err, level) =>
diff --git a/server/levels/sessions/LevelSession.coffee b/server/levels/sessions/LevelSession.coffee
index 952782f1b..c30519ba0 100644
--- a/server/levels/sessions/LevelSession.coffee
+++ b/server/levels/sessions/LevelSession.coffee
@@ -2,7 +2,7 @@
mongoose = require('mongoose')
plugins = require('../../plugins/plugins')
-jsonschema = require('./level_session_schema')
+jsonschema = require('../../../app/schemas/models/level_session')
LevelSessionSchema = new mongoose.Schema({
created:
diff --git a/server/levels/sessions/level_session_handler.coffee b/server/levels/sessions/level_session_handler.coffee
index ca8680a17..1c03a17f6 100644
--- a/server/levels/sessions/level_session_handler.coffee
+++ b/server/levels/sessions/level_session_handler.coffee
@@ -6,14 +6,22 @@ TIMEOUT = 1000 * 30 # no activity for 30 seconds means it's not active
class LevelSessionHandler extends Handler
modelClass: LevelSession
- editableProperties: ['multiplayer', 'players', 'code', 'completed', 'state',
+ editableProperties: ['multiplayer', 'players', 'code', 'codeLanguage', 'completed', 'state',
'levelName', 'creatorName', 'levelID', 'screenshot',
- 'chat', 'teamSpells', 'submitted', 'unsubscribed']
+ 'chat', 'teamSpells', 'submitted', 'unsubscribed','playtime']
+ jsonSchema: require '../../../app/schemas/models/level_session'
getByRelationship: (req, res, args...) ->
return @getActiveSessions req, res if args.length is 2 and args[1] is 'active'
- return @sendNotFoundError(res)
-
+ super(arguments...)
+
+ formatEntity: (req, document) ->
+ documentObject = super(req, document)
+ if req.user.isAdmin() or req.user.id is document.creator
+ return documentObject
+ else
+ return _.omit documentObject, ['submittedCode','code']
+
getActiveSessions: (req, res) ->
return @sendUnauthorizedError(res) unless req.user.isAdmin()
start = new Date()
diff --git a/server/levels/systems/LevelSystem.coffee b/server/levels/systems/LevelSystem.coffee
index cf21f7355..f945aaa95 100644
--- a/server/levels/systems/LevelSystem.coffee
+++ b/server/levels/systems/LevelSystem.coffee
@@ -1,6 +1,6 @@
mongoose = require('mongoose')
plugins = require('../../plugins/plugins')
-jsonschema = require('./level_system_schema')
+jsonschema = require('../../../app/schemas/models/level_system')
LevelSystemSchema = new mongoose.Schema {
description: String
@@ -10,6 +10,7 @@ LevelSystemSchema.plugin(plugins.NamedPlugin)
LevelSystemSchema.plugin(plugins.PermissionsPlugin)
LevelSystemSchema.plugin(plugins.VersionedPlugin)
LevelSystemSchema.plugin(plugins.SearchablePlugin, {searchable: ['name', 'description']})
+LevelSystemSchema.plugin(plugins.PatchablePlugin)
LevelSystemSchema.pre 'init', (next) ->
return next() unless jsonschema.properties?
diff --git a/server/levels/systems/level_system_handler.coffee b/server/levels/systems/level_system_handler.coffee
index 1b1e511c1..bf1bb39d5 100644
--- a/server/levels/systems/level_system_handler.coffee
+++ b/server/levels/systems/level_system_handler.coffee
@@ -13,6 +13,7 @@ LevelSystemHandler = class LevelSystemHandler extends Handler
'configSchema'
]
postEditableProperties: ['name']
+ jsonSchema: require '../../../app/schemas/models/level_system'
getEditableProperties: (req, document) ->
props = super(req, document)
diff --git a/server/levels/thangs/ThangType.coffee b/server/levels/thangs/ThangType.coffee
index 92915e8d0..292597719 100644
--- a/server/levels/thangs/ThangType.coffee
+++ b/server/levels/thangs/ThangType.coffee
@@ -5,8 +5,9 @@ ThangTypeSchema = new mongoose.Schema({
body: String,
}, {strict: false})
-ThangTypeSchema.plugin(plugins.NamedPlugin)
-ThangTypeSchema.plugin(plugins.VersionedPlugin)
-ThangTypeSchema.plugin(plugins.SearchablePlugin, {searchable: ['name']})
+ThangTypeSchema.plugin plugins.NamedPlugin
+ThangTypeSchema.plugin plugins.VersionedPlugin
+ThangTypeSchema.plugin plugins.SearchablePlugin, {searchable: ['name']}
+ThangTypeSchema.plugin plugins.PatchablePlugin
module.exports = mongoose.model('thang.type', ThangTypeSchema)
diff --git a/server/levels/thangs/thang_type_handler.coffee b/server/levels/thangs/thang_type_handler.coffee
index a446b56be..a8d5c05e7 100644
--- a/server/levels/thangs/thang_type_handler.coffee
+++ b/server/levels/thangs/thang_type_handler.coffee
@@ -3,22 +3,24 @@ Handler = require('../../commons/Handler')
ThangTypeHandler = class ThangTypeHandler extends Handler
modelClass: ThangType
+ jsonSchema: require '../../../app/schemas/models/thang_type'
editableProperties: [
- 'name',
- 'raw',
- 'actions',
- 'soundTriggers',
- 'rotationType',
- 'matchWorldDimensions',
- 'shadow',
- 'layerPriority',
- 'staticImage',
- 'scale',
- 'positions',
- 'snap',
- 'components',
- 'colorGroups',
+ 'name'
+ 'raw'
+ 'actions'
+ 'soundTriggers'
+ 'rotationType'
+ 'matchWorldDimensions'
+ 'shadow'
+ 'layerPriority'
+ 'staticImage'
+ 'scale'
+ 'positions'
+ 'snap'
+ 'components'
+ 'colorGroups'
'kind'
+ 'raster'
]
hasAccess: (req) ->
diff --git a/server/patches/Patch.coffee b/server/patches/Patch.coffee
new file mode 100644
index 000000000..3e12638cf
--- /dev/null
+++ b/server/patches/Patch.coffee
@@ -0,0 +1,48 @@
+mongoose = require('mongoose')
+{handlers} = require '../commons/mapping'
+
+PatchSchema = new mongoose.Schema({}, {strict: false})
+
+PatchSchema.pre 'save', (next) ->
+ return next() unless @isNew # patch can't be altered after creation, so only need to check data once
+ target = @get('target')
+ targetID = target.id
+ Handler = require '../commons/Handler'
+ if not Handler.isID(targetID)
+ err = new Error('Invalid input.')
+ err.response = {message:"isn't a MongoDB id.", property:'target.id'}
+ err.code = 422
+ return next(err)
+
+ collection = target.collection
+ handler = require('../' + handlers[collection])
+ handler.getDocumentForIdOrSlug targetID, (err, document) =>
+ if err
+ err = new Error('Server error.')
+ err.response = {message:'', property:'target.id'}
+ err.code = 500
+ return next(err)
+
+ if not document
+ err = new Error('Target of patch not found.')
+ err.response = {message:'was not found.', property:'target.id'}
+ err.code = 404
+ return next(err)
+
+ target.id = document.get('_id')
+ if handler.modelClass.schema.uses_coco_versions
+ target.original = document.get('original')
+ version = document.get('version')
+ target.version = _.pick document.get('version'), 'major', 'minor'
+ @set('target', target)
+ else
+ target.original = targetID
+
+ patches = document.get('patches') or []
+ patches = _.clone patches
+ patches.push @_id
+ document.set 'patches', patches, {strict: false}
+ @targetLoaded = document
+ document.save (err) -> next(err)
+
+module.exports = mongoose.model('patch', PatchSchema)
diff --git a/server/patches/patch_handler.coffee b/server/patches/patch_handler.coffee
new file mode 100644
index 000000000..7d30ce353
--- /dev/null
+++ b/server/patches/patch_handler.coffee
@@ -0,0 +1,81 @@
+Patch = require('./Patch')
+User = require '../users/User'
+Handler = require('../commons/Handler')
+schema = require '../../app/schemas/models/patch'
+{handlers} = require '../commons/mapping'
+mongoose = require('mongoose')
+log = require 'winston'
+sendwithus = require '../sendwithus'
+
+PatchHandler = class PatchHandler extends Handler
+ modelClass: Patch
+ editableProperties: []
+ postEditableProperties: ['delta', 'target', 'commitMessage']
+ jsonSchema: require '../../app/schemas/models/patch'
+
+ makeNewInstance: (req) ->
+ patch = super(req)
+ patch.set 'creator', req.user._id
+ patch.set 'created', new Date().toISOString()
+ patch.set 'status', 'pending'
+ patch
+
+ getByRelationship: (req, res, args...) ->
+ return @setStatus(req, res, args[0]) if req.route.method is 'put' and args[1] is 'status'
+ super(arguments...)
+
+ setStatus: (req, res, id) ->
+ newStatus = req.body.status
+ unless newStatus in ['rejected', 'accepted', 'withdrawn']
+ return @sendBadInputError(res, "Status must be 'rejected', 'accepted', or 'withdrawn'")
+
+ @getDocumentForIdOrSlug id, (err, patch) =>
+ return @sendDatabaseError(res, err) if err
+ return @sendNotFoundError(res) unless patch?
+ targetInfo = patch.get('target')
+ targetHandler = require('../' + handlers[targetInfo.collection])
+ targetModel = targetHandler.modelClass
+
+ query = { 'original': targetInfo.original }
+ sort = { 'version.major': -1, 'version.minor': -1 }
+ targetModel.findOne(query).sort(sort).exec (err, target) =>
+ return @sendDatabaseError(res, err) if err
+ return @sendNotFoundError(res) unless target?
+ return @sendUnauthorizedError(res) unless targetHandler.hasAccessToDocument(req, target, 'get')
+
+ if newStatus in ['rejected', 'accepted']
+ return @sendUnauthorizedError(res) unless targetHandler.hasAccessToDocument(req, target, 'put')
+
+ if newStatus is 'withdrawn'
+ return @sendUnauthorizedError(res) unless req.user.get('_id').equals patch.get('creator')
+
+ # these require callbacks
+ patch.update {$set:{status:newStatus}}, {}, ->
+ target.update {$pull:{patches:patch.get('_id')}}, {}, ->
+ @sendSuccess(res, null)
+
+ onPostSuccess: (req, doc) ->
+ log.error "Error sending patch created: could not find the loaded target on the patch object." unless doc.targetLoaded
+ return unless doc.targetLoaded
+ watchers = doc.targetLoaded.get('watchers') or []
+ watchers = (w for w in watchers when not w.equals(req.user.get('_id')))
+ return unless watchers?.length
+ User.find({_id:{$in:watchers}}).select({email:1, name:1}).exec (err, watchers) =>
+ for watcher in watchers
+ @sendPatchCreatedEmail req.user, watcher, doc, doc.targetLoaded, req.body.editPath
+
+ sendPatchCreatedEmail: (patchCreator, watcher, patch, target, editPath) ->
+# return if watcher._id is patchCreator._id
+ context =
+ email_id: sendwithus.templates.patch_created
+ recipient:
+ address: watcher.get('email')
+ name: watcher.get('name')
+ email_data:
+ doc_name: target.get('name') or '???'
+ submitter_name: patchCreator.get('name') or '???'
+ doc_link: "http://codecombat.com#{editPath}"
+ commit_message: patch.get('commitMessage')
+ sendwithus.api.send context, (err, result) ->
+
+module.exports = new PatchHandler()
diff --git a/server/plugins/plugins.coffee b/server/plugins/plugins.coffee
index f1f224b82..4b189967e 100644
--- a/server/plugins/plugins.coffee
+++ b/server/plugins/plugins.coffee
@@ -2,7 +2,14 @@ mongoose = require('mongoose')
User = require('../users/User')
textSearch = require('mongoose-text-search')
+module.exports.PatchablePlugin = (schema) ->
+ schema.is_patchable = true
+ schema.index({'target.original':1, 'status':'1', 'created':-1})
+
+RESERVED_NAMES = ['search', 'names']
+
module.exports.NamedPlugin = (schema) ->
+ schema.uses_coco_names = true
schema.add({name: String, slug: String})
schema.index({'slug': 1}, {unique: true, sparse: true, name: 'slug index'})
@@ -12,6 +19,11 @@ module.exports.NamedPlugin = (schema) ->
return next() unless v.isLatestMajor and v.isLatestMinor
newSlug = _.str.slugify(@get('name'))
+ if newSlug in RESERVED_NAMES
+ err = new Error('Reserved name.')
+ err.response = {message:' is a reserved name', property: 'name'}
+ err.code = 422
+ return next(err)
if newSlug isnt @get('slug')
@set('slug', newSlug)
@checkSlugConflicts(next)
@@ -22,13 +34,11 @@ module.exports.NamedPlugin = (schema) ->
schema.methods.checkSlugConflicts = (done) ->
slug = @get('slug')
- try
- id = mongoose.Types.ObjectId.createFromHexString(slug)
+ if slug.length is 24 and slug.match(/[a-f0-9]/gi)?.length is 24
err = new Error('Bad name.')
- err.response = {message:'cannot be like a MondoDB id, Mr Hacker.', property:'name'}
+ err.response = {message: 'cannot be like a MongoDB ID, Mr. Hacker.', property: 'name'}
err.code = 422
done(err)
- catch e
query = { slug:slug }
diff --git a/server/queues/scoring.coffee b/server/queues/scoring.coffee
index cd4670708..149afa959 100644
--- a/server/queues/scoring.coffee
+++ b/server/queues/scoring.coffee
@@ -36,7 +36,7 @@ module.exports.messagesInQueueCount = (req, res) ->
module.exports.addPairwiseTaskToQueueFromRequest = (req, res) ->
taskPair = req.body.sessions
- addPairwiseTaskToQueue req.body.sessions (err, success) ->
+ addPairwiseTaskToQueue req.body.sessions, (err, success) ->
if err? then return errors.serverError res, "There was an error adding pairwise tasks: #{err}"
sendResponseObject req, res, {"message":"All task pairs were succesfully sent to the queue"}
@@ -55,6 +55,7 @@ addPairwiseTaskToQueue = (taskPair, cb) ->
if taskPairError? then return cb taskPairError
cb null
+# We should rip these out, probably
module.exports.resimulateAllSessions = (req, res) ->
unless isUserAdmin req then return errors.unauthorized res, "Unauthorized. Even if you are authorized, you shouldn't do this"
@@ -99,21 +100,145 @@ resimulateSession = (originalLevelID, levelMajorVersion, session, cb) =>
if taskPairError? then return cb taskPairError, null
cb null
+selectRandomSkipIndex = (numberOfSessions) ->
+ numbers = [0...numberOfSessions]
+ numberWeights = []
+ lambda = 0.025
+
+ for number, index in numbers
+ numberWeights[index] = lambda*Math.exp(-1*lambda*number) + lambda/(numberOfSessions/15)
+ sum = numberWeights.reduce (a, b) -> a + b
+
+ for number,index in numberWeights
+ numberWeights[index] /= sum
+
+ rand = (min, max) -> Math.random() * (max - min) + min
+
+ totalWeight = 1
+ randomNumber = Math.random()
+ weightSum = 0
+
+ for number, i in numbers
+ weightSum += numberWeights[i]
+
+ if (randomNumber <= weightSum)
+ return numbers[i]
+
+module.exports.getTwoGames = (req, res) ->
+ #if userIsAnonymous req then return errors.unauthorized(res, "You need to be logged in to get games.")
+ humansGameID = req.body.humansGameID
+ ogresGameID = req.body.ogresGameID
+
+ unless ogresGameID and humansGameID
+ #fetch random games here
+ queryParams =
+ "levelID":"greed"
+ "submitted":true
+ "team":"humans"
+ selection = "team totalScore transpiledCode teamSpells levelID creatorName creator submitDate"
+ LevelSession.count queryParams, (err, numberOfHumans) =>
+ if err? then return errors.serverError(res, "Couldn't get the number of human games")
+ humanSkipCount = selectRandomSkipIndex(numberOfHumans)
+ ogreCountParams =
+ "levelID": "greed"
+ "submitted":true
+ "team":"ogres"
+ LevelSession.count ogreCountParams, (err, numberOfOgres) =>
+ if err? then return errors.serverError(res, "Couldnt' get the number of ogre games")
+ ogresSkipCount = selectRandomSkipIndex(numberOfOgres)
+
+ query = LevelSession
+ .aggregate()
+ .match(queryParams)
+ .project(selection)
+ .sort({"submitDate": -1})
+ .skip(humanSkipCount)
+ .limit(1)
+ query.exec (err, randomSession) =>
+ if err? then return errors.serverError(res, "Couldn't select a random session! #{err}")
+ randomSession = randomSession[0]
+ queryParams =
+ "levelID":"greed"
+ "submitted":true
+ "team": "ogres"
+ query = LevelSession
+ .aggregate()
+ .match(queryParams)
+ .project(selection)
+ .sort({"submitDate": -1})
+ .skip(ogresSkipCount)
+ .limit(1)
+ query.exec (err, otherSession) =>
+ if err? then return errors.serverError(res, "Couldnt' select the other random session!")
+ otherSession = otherSession[0]
+ taskObject =
+ "messageGenerated": Date.now()
+ "sessions": []
+ for session in [randomSession, otherSession]
+ sessionInformation =
+ "sessionID": session._id
+ "team": session.team ? "No team"
+ "transpiledCode": session.transpiledCode
+ "teamSpells": session.teamSpells ? {}
+ "levelID": session.levelID
+ "creatorName": session.creatorName
+ "creator": session.creator
+ "totalScore": session.totalScore
+ taskObject.sessions.push sessionInformation
+ console.log "Dispatching random game between", taskObject.sessions[0].creatorName, "and", taskObject.sessions[1].creatorName
+ sendResponseObject req, res, taskObject
+ else
+ console.log "Directly simulating #{humansGameID} vs. #{ogresGameID}."
+ LevelSession.findOne(_id: humansGameID).lean().exec (err, humanSession) =>
+ if err? then return errors.serverError(res, "Couldn't find the human game")
+ LevelSession.findOne(_id: ogresGameID).lean().exec (err, ogreSession) =>
+ if err? then return errors.serverError(res, "Couldn't find the ogre game")
+ taskObject =
+ "messageGenerated": Date.now()
+ "sessions": []
+ for session in [humanSession, ogreSession]
+ sessionInformation =
+ "sessionID": session._id
+ "team": session.team ? "No team"
+ "transpiledCode": session.transpiledCode
+ "teamSpells": session.teamSpells ? {}
+ "levelID": session.levelID
+
+ taskObject.sessions.push sessionInformation
+ sendResponseObject req, res, taskObject
+
+module.exports.recordTwoGames = (req, res) ->
+ sessions = req.body.sessions
+ console.log "Recording non-chained result of", sessions?[0]?.name, sessions[0]?.metrics?.rank, "and", sessions?[1]?.name, sessions?[1]?.metrics?.rank
+
+ yetiGuru = clientResponseObject: req.body, isRandomMatch: true
+ async.waterfall [
+ fetchLevelSession.bind(yetiGuru)
+ updateSessions.bind(yetiGuru)
+ indexNewScoreArray.bind(yetiGuru)
+ addMatchToSessions.bind(yetiGuru)
+ updateUserSimulationCounts.bind(yetiGuru, req.user._id)
+ ], (err, successMessageObject) ->
+ if err? then return errors.serverError res, "There was an error recording the single game:#{err}"
+ sendResponseObject req, res, {"message":"The single game was submitted successfully!"}
+
+
module.exports.createNewTask = (req, res) ->
requestSessionID = req.body.session
originalLevelID = req.body.originalLevelID
currentLevelID = req.body.levelID
+ transpiledCode = req.body.transpiledCode
requestLevelMajorVersion = parseInt(req.body.levelMajorVersion)
+ yetiGuru = {}
async.waterfall [
- validatePermissions.bind(@,req,requestSessionID)
- fetchAndVerifyLevelType.bind(@,currentLevelID)
- fetchSessionObjectToSubmit.bind(@, requestSessionID)
- updateSessionToSubmit
- fetchInitialSessionsToRankAgainst.bind(@, requestLevelMajorVersion, originalLevelID)
+ validatePermissions.bind(yetiGuru,req,requestSessionID)
+ fetchAndVerifyLevelType.bind(yetiGuru,currentLevelID)
+ fetchSessionObjectToSubmit.bind(yetiGuru, requestSessionID)
+ updateSessionToSubmit.bind(yetiGuru, transpiledCode)
+ fetchInitialSessionsToRankAgainst.bind(yetiGuru, requestLevelMajorVersion, originalLevelID)
generateAndSendTaskPairsToTheQueue
-
], (err, successMessageObject) ->
if err? then return errors.serverError res, "There was an error submitting the game to the queue:#{err}"
sendResponseObject req, res, successMessageObject
@@ -164,14 +289,15 @@ fetchSessionObjectToSubmit = (sessionID, callback) ->
query.exec (err, session) ->
callback err, session?.toObject()
-updateSessionToSubmit = (sessionToUpdate, callback) ->
+updateSessionToSubmit = (transpiledCode, sessionToUpdate, callback) ->
sessionUpdateObject =
submitted: true
submittedCode: sessionToUpdate.code
+ transpiledCode: transpiledCode
submitDate: new Date()
- meanStrength: 25
+ #meanStrength: 25 # Let's try not resetting the score on resubmission
standardDeviation: 25/3
- totalScore: 10
+ #totalScore: 10 # Let's try not resetting the score on resubmission
numberOfWinsAndTies: 0
numberOfLosses: 0
isRanking: true
@@ -193,10 +319,11 @@ fetchInitialSessionsToRankAgainst = (levelMajorVersion, levelID, submittedSessio
totalScore: 1
limitNumber = 1
-
- query = LevelSession.find(findParameters)
- .sort(sortParameters)
- .limit(limitNumber)
+ query = LevelSession.aggregate [
+ {$match: findParameters}
+ {$sort: sortParameters}
+ {$limit: limitNumber}
+ ]
query.exec (err, sessionToRankAgainst) ->
callback err, sessionToRankAgainst, submittedSession
@@ -206,17 +333,20 @@ generateAndSendTaskPairsToTheQueue = (sessionToRankAgainst,submittedSession, cal
taskPairs = generateTaskPairs(sessionToRankAgainst, submittedSession)
sendEachTaskPairToTheQueue taskPairs, (taskPairError) ->
if taskPairError? then return callback taskPairError
+ #console.log "Sent task pairs to the queue!"
+ #console.log taskPairs
callback null, {"message": "All task pairs were succesfully sent to the queue"}
module.exports.dispatchTaskToConsumer = (req, res) ->
+ yetiGuru = {}
async.waterfall [
- checkSimulationPermissions.bind(@,req)
+ checkSimulationPermissions.bind(yetiGuru,req)
receiveMessageFromSimulationQueue
changeMessageVisibilityTimeout
parseTaskQueueMessage
constructTaskObject
- constructTaskLogObject.bind(@, getUserIDFromRequest(req))
+ constructTaskLogObject.bind(yetiGuru, getUserIDFromRequest(req))
processTaskObject
], (err, taskObjectToSend) ->
if err?
@@ -267,11 +397,12 @@ constructTaskObject = (taskMessageBody, message, callback) ->
"sessionID": session._id
"submitDate": session.submitDate
"team": session.team ? "No team"
- "code": session.submittedCode
+ "transpiledCode": session.transpiledCode
"teamSpells": session.teamSpells ? {}
"levelID": session.levelID
"creator": session.creator
"creatorName":session.creatorName
+ "totalScore": session.totalScore
taskObject.sessions.push sessionInformation
callback null, taskObject, message
@@ -292,7 +423,7 @@ processTaskObject = (taskObject,taskLogObject, message, cb) ->
getSessionInformation = (sessionIDString, callback) ->
findParameters =
_id: sessionIDString
- selectString = 'submitDate team submittedCode teamSpells levelID creator creatorName'
+ selectString = 'submitDate team submittedCode teamSpells levelID creator creatorName transpiledCode totalScore'
query = LevelSession
.findOne(findParameters)
.select(selectString)
@@ -304,70 +435,79 @@ getSessionInformation = (sessionIDString, callback) ->
module.exports.processTaskResult = (req, res) ->
- async.waterfall [
- verifyClientResponse.bind(@,req.body)
- fetchTaskLog.bind(@)
- checkTaskLog.bind(@)
- deleteQueueMessage.bind(@)
- fetchLevelSession.bind(@)
- checkSubmissionDate.bind(@)
- logTaskComputation.bind(@)
- updateSessions.bind(@)
- indexNewScoreArray.bind(@)
- addMatchToSessions.bind(@)
- updateUserSimulationCounts.bind(@, req.user._id)
- determineIfSessionShouldContinueAndUpdateLog.bind(@)
- findNearestBetterSessionID.bind(@)
- addNewSessionsToQueue.bind(@)
- ], (err, results) ->
- if err is "shouldn't continue"
- sendResponseObject req, res, {"message":"The scores were updated successfully, person lost so no more games are being inserted!"}
- else if err is "no session was found"
- sendResponseObject req, res, {"message":"There were no more games to rank (game is at top)!"}
- else if err?
- errors.serverError res, "There was an error:#{err}"
- else
- sendResponseObject req, res, {"message":"The scores were updated successfully and more games were sent to the queue!"}
+ originalSessionID = req.body?.originalSessionID
+ yetiGuru = {}
+ try
+ async.waterfall [
+ verifyClientResponse.bind(yetiGuru,req.body)
+ fetchTaskLog.bind(yetiGuru)
+ checkTaskLog.bind(yetiGuru)
+ deleteQueueMessage.bind(yetiGuru)
+ fetchLevelSession.bind(yetiGuru)
+ checkSubmissionDate.bind(yetiGuru)
+ logTaskComputation.bind(yetiGuru)
+ updateSessions.bind(yetiGuru)
+ indexNewScoreArray.bind(yetiGuru)
+ addMatchToSessions.bind(yetiGuru)
+ updateUserSimulationCounts.bind(yetiGuru, req.user._id)
+ determineIfSessionShouldContinueAndUpdateLog.bind(yetiGuru)
+ findNearestBetterSessionID.bind(yetiGuru)
+ addNewSessionsToQueue.bind(yetiGuru)
+ ], (err, results) ->
+ if err is "shouldn't continue"
+ markSessionAsDoneRanking originalSessionID, (err) ->
+ if err? then return sendResponseObject req, res, {"error":"There was an error marking the session as done ranking"}
+ sendResponseObject req, res, {"message":"The scores were updated successfully, person lost so no more games are being inserted!"}
+ else if err is "no session was found"
+ markSessionAsDoneRanking originalSessionID, (err) ->
+ if err? then return sendResponseObject req, res, {"error":"There was an error marking the session as done ranking"}
+ sendResponseObject req, res, {"message":"There were no more games to rank (game is at top)!"}
+ else if err?
+ errors.serverError res, "There was an error:#{err}"
+ else
+ sendResponseObject req, res, {"message":"The scores were updated successfully and more games were sent to the queue!"}
+ catch e
+ errors.serverError res, "There was an error processing the task result!"
verifyClientResponse = (responseObject, callback) ->
#TODO: better verification
- unless typeof responseObject is "object"
+ if typeof responseObject isnt "object" or responseObject?.originalSessionID?.length isnt 24
callback "The response to that query is required to be a JSON object."
else
@clientResponseObject = responseObject
- log.info "Verified client response!"
+
+ #log.info "Verified client response!"
callback null, responseObject
fetchTaskLog = (responseObject, callback) ->
- findParameters =
- _id: responseObject.taskID
- query = TaskLog
- .findOne(findParameters)
+ query = TaskLog.findOne _id: responseObject.taskID
query.exec (err, taskLog) =>
+ return callback new Error("Couldn't find TaskLog for _id #{responseObject.taskID}!") unless taskLog
@taskLog = taskLog
- log.info "Fetched task log!"
+ #log.info "Fetched task log!"
callback err, taskLog.toObject()
checkTaskLog = (taskLog, callback) ->
if taskLog.calculationTimeMS then return callback "That computational task has already been performed"
if hasTaskTimedOut taskLog.sentDate then return callback "The task has timed out"
- log.info "Checked task log"
+ #log.info "Checked task log"
callback null
deleteQueueMessage = (callback) ->
scoringTaskQueue.deleteMessage @clientResponseObject.receiptHandle, (err) ->
- log.info "Deleted queue message"
+ #log.info "Deleted queue message"
callback err
fetchLevelSession = (callback) ->
findParameters =
_id: @clientResponseObject.originalSessionID
+
query = LevelSession
.findOne(findParameters)
.lean()
query.exec (err, session) =>
@levelSession = session
- log.info "Fetched level session"
+ #log.info "Fetched level session"
callback err
@@ -376,7 +516,7 @@ checkSubmissionDate = (callback) ->
if Number(supposedSubmissionDate) isnt Number(@levelSession.submitDate)
callback "The game has been resubmitted. Removing from queue..."
else
- log.info "Checked submission date"
+ #log.info "Checked submission date"
callback null
logTaskComputation = (callback) ->
@@ -385,7 +525,7 @@ logTaskComputation = (callback) ->
@taskLog.calculationTimeMS = @clientResponseObject.calculationTimeMS
@taskLog.sessions = @clientResponseObject.sessions
@taskLog.save (err, saved) ->
- log.info "Logged task computation"
+ #log.info "Logged task computation"
callback err
updateSessions = (callback) ->
@@ -393,15 +533,16 @@ updateSessions = (callback) ->
async.map sessionIDs, retrieveOldSessionData, (err, oldScores) =>
if err? then callback err, {"error": "There was an error retrieving the old scores"}
-
- oldScoreArray = _.toArray putRankingFromMetricsIntoScoreObject @clientResponseObject, oldScores
- newScoreArray = bayes.updatePlayerSkills oldScoreArray
- saveNewScoresToDatabase newScoreArray, callback
-
+ try
+ oldScoreArray = _.toArray putRankingFromMetricsIntoScoreObject @clientResponseObject, oldScores
+ newScoreArray = bayes.updatePlayerSkills oldScoreArray
+ saveNewScoresToDatabase newScoreArray, callback
+ catch e
+ callback e
saveNewScoresToDatabase = (newScoreArray, callback) ->
async.eachSeries newScoreArray, updateScoreInSession, (err) ->
- log.info "Saved new scores to database"
+ #log.info "Saved new scores to database"
callback err,newScoreArray
@@ -419,7 +560,7 @@ updateScoreInSession = (scoreObject,callback) ->
$push: {scoreHistory: {$each: [scoreHistoryAddition], $slice: -1000}}
LevelSession.update {"_id": scoreObject.id}, updateObject, callback
- log.info "New total score for session #{scoreObject.id} is #{updateObject.totalScore}"
+ #log.info "New total score for session #{scoreObject.id} is #{updateObject.totalScore}"
indexNewScoreArray = (newScoreArray, callback) ->
newScoresObject = _.indexBy newScoreArray, 'id'
@@ -435,14 +576,17 @@ addMatchToSessions = (newScoreObject, callback) ->
matchObject.opponents[sessionID] = {}
matchObject.opponents[sessionID].sessionID = sessionID
matchObject.opponents[sessionID].userID = session.creator
+ matchObject.opponents[sessionID].name = session.name
+ matchObject.opponents[sessionID].totalScore = session.totalScore
matchObject.opponents[sessionID].metrics = {}
- matchObject.opponents[sessionID].metrics.rank = Number(newScoreObject[sessionID].gameRanking)
+ matchObject.opponents[sessionID].metrics.rank = Number(newScoreObject[sessionID]?.gameRanking ? 0)
- log.info "Match object computed, result: #{matchObject}"
- log.info "Writing match object to database..."
+ #log.info "Match object computed, result: #{matchObject}"
+ #log.info "Writing match object to database..."
#use bind with async to do the writes
sessionIDs = _.pluck @clientResponseObject.sessions, 'sessionID'
- async.each sessionIDs, updateMatchesInSession.bind(@,matchObject), (err) -> callback err
+ async.each sessionIDs, updateMatchesInSession.bind(@,matchObject), (err) ->
+ callback err
updateMatchesInSession = (matchObject, sessionID, callback) ->
currentMatchObject = {}
@@ -452,16 +596,22 @@ updateMatchesInSession = (matchObject, sessionID, callback) ->
opponentsClone = _.omit opponentsClone, sessionID
opponentsArray = _.toArray opponentsClone
currentMatchObject.opponents = opponentsArray
-
- sessionUpdateObject =
- $push: {matches: {$each: [currentMatchObject], $slice: -200}}
- log.info "Updating session #{sessionID}"
- LevelSession.update {"_id":sessionID}, sessionUpdateObject, callback
+ LevelSession.findOne {"_id": sessionID}, (err, session) ->
+ session = session.toObject()
+ currentMatchObject.playtime = session.playtime ? 0
+ sessionUpdateObject =
+ $push: {matches: {$each: [currentMatchObject], $slice: -200}}
+ #log.info "Updating session #{sessionID}"
+ LevelSession.update {"_id":sessionID}, sessionUpdateObject, callback
updateUserSimulationCounts = (reqUserID,callback) ->
incrementUserSimulationCount reqUserID, 'simulatedBy', (err) =>
if err? then return callback err
- incrementUserSimulationCount @levelSession.creator, 'simulatedFor', callback
+ console.log "Incremented user simulation count!"
+ unless @isRandomMatch
+ incrementUserSimulationCount @levelSession.creator, 'simulatedFor', callback
+ else
+ callback null
incrementUserSimulationCount = (userID, type, callback) =>
inc = {}
@@ -491,7 +641,7 @@ determineIfSessionShouldContinueAndUpdateLog = (cb) ->
totalNumberOfGamesPlayed = updatedSession.numberOfWinsAndTies + updatedSession.numberOfLosses
if totalNumberOfGamesPlayed < 10
- console.log "Number of games played is less than 10, continuing..."
+ #console.log "Number of games played is less than 10, continuing..."
cb null
else
ratio = (updatedSession.numberOfLosses) / (totalNumberOfGamesPlayed)
@@ -499,18 +649,21 @@ determineIfSessionShouldContinueAndUpdateLog = (cb) ->
cb "shouldn't continue"
console.log "Ratio(#{ratio}) is bad, ending simulation"
else
- console.log "Ratio(#{ratio}) is good, so continuing simulations"
+ #console.log "Ratio(#{ratio}) is good, so continuing simulations"
cb null
findNearestBetterSessionID = (cb) ->
- levelOriginalID = @levelSession.level.original
- levelMajorVersion = @levelSession.level.majorVersion
- sessionID = @clientResponseObject.originalSessionID
- sessionTotalScore = @newScoresObject[sessionID].totalScore
- opponentSessionID = _.pull(_.keys(@newScoresObject), sessionID)
- opponentSessionTotalScore = @newScoresObject[opponentSessionID].totalScore
- opposingTeam = calculateOpposingTeam(@clientResponseObject.originalSessionTeam)
+ try
+ levelOriginalID = @levelSession.level.original
+ levelMajorVersion = @levelSession.level.majorVersion
+ sessionID = @clientResponseObject.originalSessionID
+ sessionTotalScore = @newScoresObject[sessionID].totalScore
+ opponentSessionID = _.pull(_.keys(@newScoresObject), sessionID)
+ opponentSessionTotalScore = @newScoresObject[opponentSessionID].totalScore
+ opposingTeam = calculateOpposingTeam(@clientResponseObject.originalSessionTeam)
+ catch e
+ cb e
retrieveAllOpponentSessionIDs sessionID, (err, opponentSessionIDs) ->
if err? then return cb err, null
@@ -545,11 +698,11 @@ findNearestBetterSessionID = (cb) ->
.select(selectString)
.lean()
- console.log "Finding session with score near #{opponentSessionTotalScore}"
+ #console.log "Finding session with score near #{opponentSessionTotalScore}"
query.exec (err, session) ->
if err? then return cb err, session
unless session then return cb "no session was found"
- console.log "Found session with score #{session.totalScore}"
+ #console.log "Found session with score #{session.totalScore}"
cb err, session._id
@@ -580,11 +733,12 @@ sendEachTaskPairToTheQueue = (taskPairs, callback) -> async.each taskPairs, send
generateTaskPairs = (submittedSessions, sessionToScore) ->
taskPairs = []
for session in submittedSessions
- session = session.toObject()
+ if session.toObject?
+ session = session.toObject()
teams = ['ogres','humans']
opposingTeams = _.pull teams, sessionToScore.team
if String(session._id) isnt String(sessionToScore._id) and session.team in opposingTeams
- console.log "Adding game to taskPairs!"
+ #console.log "Adding game to taskPairs!"
taskPairs.push [sessionToScore._id,String session._id]
return taskPairs
@@ -606,7 +760,7 @@ hasTaskTimedOut = (taskSentTimestamp) -> taskSentTimestamp + scoringTaskTimeoutI
handleTimedOutTask = (req, res, taskBody) -> errors.clientTimeout res, "The results weren't provided within the timeout"
-putRankingFromMetricsIntoScoreObject = (taskObject,scoreObject) ->
+putRankingFromMetricsIntoScoreObject = (taskObject, scoreObject) ->
scoreObject = _.indexBy scoreObject, 'id'
scoreObject[session.sessionID].gameRanking = session.metrics.rank for session in taskObject.sessions
return scoreObject
@@ -622,3 +776,7 @@ retrieveOldSessionData = (sessionID, callback) ->
"totalScore":session.totalScore ? (25 - 1.8*(25/3))
"id": sessionID
callback err, oldScoreObject
+
+markSessionAsDoneRanking = (sessionID, cb) ->
+ #console.log "Marking session as done ranking..."
+ LevelSession.update {"_id":sessionID}, {"isRanking":false}, cb
diff --git a/server/routes/auth.coffee b/server/routes/auth.coffee
index 76612e2e0..eed93dfae 100644
--- a/server/routes/auth.coffee
+++ b/server/routes/auth.coffee
@@ -107,6 +107,7 @@ module.exports.setup = (app) ->
else
return res.end()
else
+ console.log 'password is', user.get('passwordReset')
res.send user.get('passwordReset')
return res.end()
)
@@ -131,11 +132,25 @@ module.exports.setup = (app) ->
if not user
return errors.notFound res, "No user found with email '#{req.query.email}'"
- user.set('emailSubscriptions', [])
- user.save (err) =>
+ emails = _.clone(user.get('emails')) or {}
+ msg = ''
+
+ if req.query.recruitNotes
+ emails.recruitNotes ?= {}
+ emails.recruitNotes.enabled = false
+ msg = "Unsubscribed #{req.query.email} from recruiting emails."
+
+ else
+ msg = "Unsubscribed #{req.query.email} from all CodeCombat emails. Sorry to see you go!"
+ emailSettings.enabled = false for emailSettings in _.values(emails)
+ emails.generalNews ?= {}
+ emails.generalNews.enabled = false
+ emails.anyNotes ?= {}
+ emails.anyNotes.enabled = false
+
+ user.update {$set: {emails: emails}}, {}, =>
return errors.serverError res, 'Database failure.' if err
-
- res.send "Unsubscribed #{req.query.email} from all CodeCombat emails. Sorry to see you go! "
+ res.send msg + ""
res.end()
module.exports.loginUser = loginUser = (req, res, user, send=true, next=null) ->
diff --git a/server/routes/contact.coffee b/server/routes/contact.coffee
index 51aaa78fc..1ceb8d196 100644
--- a/server/routes/contact.coffee
+++ b/server/routes/contact.coffee
@@ -1,26 +1,38 @@
config = require '../../server_config'
log = require 'winston'
mail = require '../commons/mail'
+User = require '../users/User'
module.exports.setup = (app) ->
app.post '/contact', (req, res) ->
return res.end() unless req.user
log.info "Sending mail from #{req.body.email} saying #{req.body.message}"
if config.isProduction
- options = createMailOptions req.body.email, req.body.message, req.user
- mail.transport.sendMail options, (error, response) ->
- if error
- log.error "Error sending mail: #{error.message or error}"
- else
- log.info "Mail sent successfully. Response: #{response.message}"
+ createMailOptions req.body.email, req.body.message, req.user, req.body.recipientID, req.body.subject, (options) ->
+ mail.transport.sendMail options, (error, response) ->
+ if error
+ log.error "Error sending mail: #{error.message or error}"
+ else
+ log.info "Mail sent successfully. Response: #{response.message}"
return res.end()
-createMailOptions = (sender, message, user) ->
+createMailOptions = (sender, message, user, recipientID, subject, done) ->
# TODO: use email templates here
options =
from: config.mail.username
to: config.mail.username
replyTo: sender
- subject: "[CodeCombat] Feedback - #{sender}"
+ subject: "[CodeCombat] #{subject ? ('Feedback - ' + sender)}"
text: "#{message}\n\nUsername: #{user.get('name') or 'Anonymous'}\nID: #{user._id}"
- #html: message.replace '\n', '
\n'
\ No newline at end of file
+ #html: message.replace '\n', '
\n'
+
+ if recipientID and (user.isAdmin() or ('employer' in (user.permissions ? [])))
+ User.findById(recipientID, 'email').exec (err, document) ->
+ if err
+ log.error "Error looking up recipient to email from #{recipientID}: #{err}" if err
+ else
+ options.bcc = options.to
+ options.to = document.get('email')
+ done options
+ else
+ done options
diff --git a/server/routes/db.coffee b/server/routes/db.coffee
index 723e15b90..f65a56744 100644
--- a/server/routes/db.coffee
+++ b/server/routes/db.coffee
@@ -1,12 +1,12 @@
log = require 'winston'
errors = require '../commons/errors'
handlers = require('../commons/mapping').handlers
-schemas = require('../commons/mapping').schemas
mongoose = require 'mongoose'
module.exports.setup = (app) ->
# This is hacky and should probably get moved somewhere else, I dunno
app.get '/db/cla.submissions', (req, res) ->
+ return errors.unauthorized(res, "You must be an admin to view that information") unless req.user?.isAdmin()
res.setHeader('Content-Type', 'application/json')
collection = mongoose.connection.db.collection 'cla.submissions', (err, collection) ->
return log.error "Couldn't fetch CLA submissions because #{err}" if err
@@ -35,6 +35,7 @@ module.exports.setup = (app) ->
return handler.versions(req, res, parts[1]) if parts[2] is 'versions'
return handler.files(req, res, parts[1]) if parts[2] is 'files'
return handler.search(req, res) if req.route.method is 'get' and parts[1] is 'search'
+ return handler.getNamesByIDs(req, res) if req.route.method in ['get', 'post'] and parts[1] is 'names'
return handler.getByRelationship(req, res, parts[1..]...) if parts.length > 2
return handler.getById(req, res, parts[1]) if req.route.method is 'get' and parts[1]?
return handler.patch(req, res, parts[1]) if req.route.method is 'patch' and parts[1]?
@@ -42,14 +43,15 @@ module.exports.setup = (app) ->
catch error
log.error("Error trying db method #{req.route.method} route #{parts} from #{name}: #{error}")
log.error(error)
+ log.error(error.stack)
errors.notFound(res, "Route #{req.path} not found.")
getSchema = (req, res, moduleName) ->
try
- name = schemas[moduleName.replace '.', '_']
- schema = require('../' + name)
+ name = moduleName.replace '.', '_'
+ schema = require('../../app/schemas/models/' + name)
- res.send(schema)
+ res.send(JSON.stringify(schema, null, '\t'))
res.end()
catch error
diff --git a/server/routes/file.coffee b/server/routes/file.coffee
index 7a16c3709..1cc0f73d7 100644
--- a/server/routes/file.coffee
+++ b/server/routes/file.coffee
@@ -19,7 +19,7 @@ fileGet = (req, res) ->
objectId = mongoose.Types.ObjectId(path)
query = objectId
catch e
- path = path.split('/')
+ path = path.split('/')
filename = path[path.length-1]
path = path[...path.length-1].join('/')
query =
@@ -34,7 +34,7 @@ fileGet = (req, res) ->
res.setHeader('Content-Type', 'text/json')
res.send(results)
res.end()
-
+
else
Grid.gfs.collection('media').findOne query, (err, filedata) =>
return errors.notFound(res) if not filedata
@@ -42,7 +42,7 @@ fileGet = (req, res) ->
if req.headers['if-modified-since'] is filedata.uploadDate
res.status(304)
return res.end()
-
+
res.setHeader('Content-Type', filedata.contentType)
res.setHeader('Last-Modified', filedata.uploadDate)
res.setHeader('Cache-Control', 'public')
@@ -70,7 +70,7 @@ postFileSchema =
required: ['filename', 'mimetype', 'path']
filePost = (req, res) ->
- return errors.forbidden(res) unless req.user?.isAdmin()
+ return errors.forbidden(res) unless req.user
options = req.body
tv4 = require('tv4').tv4
valid = tv4.validate(options, postFileSchema)
@@ -83,7 +83,7 @@ filePost = (req, res) ->
saveURL = (req, res) ->
options = createPostOptions(req)
- checkExistence options, res, req.body.force, (err) ->
+ checkExistence options, req, res, req.body.force, (err) ->
return errors.serverError(res) if err
writestream = Grid.gfs.createWriteStream(options)
request(req.body.url).pipe(writestream)
@@ -91,7 +91,7 @@ saveURL = (req, res) ->
saveFile = (req, res) ->
options = createPostOptions(req)
- checkExistence options, res, req.body.force, (err) ->
+ checkExistence options, req, res, req.body.force, (err) ->
return if err
writestream = Grid.gfs.createWriteStream(options)
f = req.files[req.body.postName]
@@ -101,8 +101,8 @@ saveFile = (req, res) ->
savePNG = (req, res) ->
options = createPostOptions(req)
- checkExistence options, res, req.body.force, (err) ->
- return errors.serverError(res) if err
+ checkExistence options, req, res, req.body.force, (err) ->
+ return if err
writestream = Grid.gfs.createWriteStream(options)
img = new Buffer(req.body.b64png, 'base64')
streamBuffers = require 'stream-buffers'
@@ -110,21 +110,32 @@ savePNG = (req, res) ->
myReadableStreamBuffer.put(img)
myReadableStreamBuffer.pipe(writestream)
handleStreamEnd(res, writestream)
+
+userCanEditFile = (user=null, file=null) ->
+ # no user means 'anyone'. No file means 'any file'
+ return false unless user
+ return true if user.isAdmin()
+ return false unless file
+ return true if file.metadata.creator is user.id
+ return false
-checkExistence = (options, res, force, done) ->
+checkExistence = (options, req, res, force, done) ->
q = {
filename: options.filename
'metadata.path': options.metadata.path
}
Grid.gfs.collection('media').find(q).toArray (err, files) ->
- if files.length and not force
- errors.conflict(res)
+ file = files[0]
+ if file and ((not userCanEditFile(req.user, file) or (not force)))
+ errors.conflict(res, {canForce:userCanEditFile(req.user, file)})
done(true)
- else if files.length
- q = { _id: files[0]._id }
+ else if file
+ q = { _id: file._id }
q.root = 'media'
Grid.gfs.remove q, (err) ->
- return errors.serverError(res) if err
+ if err
+ errors.serverError(res)
+ return done(true)
done()
else
done()
@@ -143,11 +154,11 @@ createPostOptions = (req) ->
unless req.body.name
name = req.body.filename.split('.')[0]
req.body.name = _.str.humanize(name)
-
+
path = req.body.path or ''
path = path[1...] if path and path[0] is '/'
path = path[...path.length-2] if path and path[path.length-1] is '/'
-
+
options =
mode: 'w'
filename: req.body.filename
@@ -158,6 +169,6 @@ createPostOptions = (req) ->
name: req.body.name
path: path
creator: ''+req.user._id
- options.metadata.description = req.body.description if req.body.description?
+ options.metadata.description = req.body.description if req.body.description?
options
diff --git a/server/routes/mail.coffee b/server/routes/mail.coffee
index 6527e4a26..e7c2ee361 100644
--- a/server/routes/mail.coffee
+++ b/server/routes/mail.coffee
@@ -1,5 +1,4 @@
mail = require '../commons/mail'
-map = _.invert mail.MAILCHIMP_GROUP_MAP
User = require '../users/User.coffee'
errors = require '../commons/errors'
#request = require 'request'
@@ -37,8 +36,9 @@ getTimeFromDaysAgo = (now, daysAgo) ->
t = now - 86400 * 1000 * daysAgo - LADDER_PREGAME_INTERVAL
isRequestFromDesignatedCronHandler = (req, res) ->
- if req.ip isnt config.mail.cronHandlerPublicIP and req.ip isnt config.mail.cronHandlerPrivateIP
- console.log "RECEIVED REQUEST FROM IP #{req.ip}(headers indicate #{req.headers['x-forwarded-for']}"
+ requestIP = req.headers['x-forwarded-for']?.replace(" ","").split(",")[0]
+ if requestIP isnt config.mail.cronHandlerPublicIP and requestIP isnt config.mail.cronHandlerPrivateIP
+ console.log "RECEIVED REQUEST FROM IP #{requestIP}(headers indicate #{req.headers['x-forwarded-for']}"
console.log "UNAUTHORIZED ATTEMPT TO SEND TRANSACTIONAL LADDER EMAIL THROUGH CRON MAIL HANDLER"
res.send("You aren't authorized to perform that action. Only the specified Cron handler may perform that action.")
res.end()
@@ -53,7 +53,7 @@ handleLadderUpdate = (req, res) ->
res.send('Great work, Captain Cron! I can take it from here.')
res.end()
# TODO: somehow fetch the histograms
- emailDays = [1, 2, 4, 7, 30]
+ emailDays = [1, 2, 4, 7, 14, 30]
now = new Date()
for daysAgo in emailDays
# Get every session that was submitted in a 5-minute window after the time.
@@ -76,17 +76,18 @@ handleLadderUpdate = (req, res) ->
sendLadderUpdateEmail result, now, daysAgo for result in results
sendLadderUpdateEmail = (session, now, daysAgo) ->
- User.findOne({_id: session.creator}).select("name email firstName lastName emailSubscriptions preferredLanguage").lean().exec (err, user) ->
+ User.findOne({_id: session.creator}).select("name email firstName lastName emailSubscriptions emails preferredLanguage").exec (err, user) ->
if err
log.error "Couldn't find user for #{session.creator} from session #{session._id}"
return
- unless user.email and ('notification' in user.emailSubscriptions) and not session.unsubscribed
- log.info "Not sending email to #{user.email} #{user.name} because they only want emails about #{user.emailSubscriptions} - session unsubscribed: #{session.unsubscribed}"
+ allowNotes = user.isEmailSubscriptionEnabled 'anyNotes'
+ unless user.get('email') and allowNotes and not session.unsubscribed
+ log.info "Not sending email to #{user.get('email')} #{user.get('name')} because they only want emails about #{user.get('emailSubscriptions')}, #{user.get('emails')} - session unsubscribed: #{session.unsubscribed}"
return
unless session.levelName
- log.info "Not sending email to #{user.email} #{user.name} because the session had no levelName in it."
+ log.info "Not sending email to #{user.get('email')} #{user.get('name')} because the session had no levelName in it."
return
- name = if user.firstName and user.lastName then "#{user.firstName}" else user.name
+ name = if user.get('firstName') and user.get('lastName') then "#{user.get('firstName')}" else user.get('name')
name = "Wizard" if not name or name is "Anoner"
# Fetch the most recent defeat and victory, if there are any.
@@ -107,7 +108,7 @@ sendLadderUpdateEmail = (session, now, daysAgo) ->
context =
email_id: sendwithus.templates.ladder_update_email
recipient:
- address: if DEBUGGING then 'nick@codecombat.com' else user.email
+ address: if DEBUGGING then 'nick@codecombat.com' else user.get('email')
name: name
email_data:
name: name
@@ -197,13 +198,11 @@ handleMailchimpWebHook = (req, res) ->
return errors.serverError(res) if err
res.end('Success')
+module.exports.handleProfileUpdate = handleProfileUpdate = (user, post) ->
+ mailchimpSubs = post.data.merges.INTERESTS.split(', ')
-handleProfileUpdate = (user, post) ->
- groups = post.data.merges.INTERESTS.split(', ')
- groups = (map[g] for g in groups when map[g])
- otherSubscriptions = (g for g in user.get('emailSubscriptions') when not mail.MAILCHIMP_GROUP_MAP[g])
- groups = groups.concat otherSubscriptions
- user.set 'emailSubscriptions', groups
+ for [mailchimpEmailGroup, emailGroup] in _.zip(mail.MAILCHIMP_GROUPS, mail.NEWS_GROUPS)
+ user.setEmailSubscription emailGroup, mailchimpEmailGroup in mailchimpSubs
fname = post.data.merges.FNAME
user.set('firstName', fname) if fname
@@ -216,7 +215,9 @@ handleProfileUpdate = (user, post) ->
# badLog("Updating user object to: #{JSON.stringify(user.toObject(), null, '\t')}")
-handleUnsubscribe = (user) ->
+module.exports.handleUnsubscribe = handleUnsubscribe = (user) ->
user.set 'emailSubscriptions', []
+ for emailGroup in mail.NEWS_GROUPS
+ user.setEmailSubscription emailGroup, false
# badLog("Unsubscribing user object to: #{JSON.stringify(user.toObject(), null, '\t')}")
diff --git a/server/routes/queue.coffee b/server/routes/queue.coffee
index 18d8cc80b..388bce4e0 100644
--- a/server/routes/queue.coffee
+++ b/server/routes/queue.coffee
@@ -18,6 +18,13 @@ module.exports.setup = (app) ->
handler = loadQueueHandler 'scoring'
handler.resimulateAllSessions req, res
+ app.post '/queue/scoring/getTwoGames', (req, res) ->
+ handler = loadQueueHandler 'scoring'
+ handler.getTwoGames req, res
+
+ app.put '/queue/scoring/recordTwoGames', (req, res) ->
+ handler = loadQueueHandler 'scoring'
+ handler.recordTwoGames req, res
app.all '/queue/*', (req, res) ->
setResponseHeaderToJSONContentType res
diff --git a/server/sendwithus.coffee b/server/sendwithus.coffee
index ad7a07500..1f8145eb1 100644
--- a/server/sendwithus.coffee
+++ b/server/sendwithus.coffee
@@ -1,14 +1,17 @@
config = require '../server_config'
sendwithusAPI = require 'sendwithus'
swuAPIKey = config.mail.sendwithusAPIKey
-queues = require './commons/queue'
module.exports.setupRoutes = (app) ->
return
-
debug = not config.isProduction
module.exports.api = new sendwithusAPI swuAPIKey, debug
+if config.unittest
+ module.exports.api.send = ->
module.exports.templates =
welcome_email: 'utnGaBHuSU4Hmsi7qrAypU'
ladder_update_email: 'JzaZxf39A4cKMxpPZUfWy4'
+ patch_created: 'tem_xhxuNosLALsizTNojBjNcL'
+ change_made_notify_watcher: 'tem_7KVkfmv9SZETb25dtHbUtG'
+ one_time_recruiting_email: 'tem_mdFMgtcczHKYu94Jmq68j8'
diff --git a/server/users/User.coffee b/server/users/User.coffee
index 28009e610..744b8db7b 100644
--- a/server/users/User.coffee
+++ b/server/users/User.coffee
@@ -1,5 +1,5 @@
mongoose = require('mongoose')
-jsonschema = require('./user_schema')
+jsonschema = require('../../app/schemas/models/user')
crypto = require('crypto')
{salt, isProduction} = require('../../server_config')
mail = require '../commons/mail'
@@ -16,33 +16,66 @@ UserSchema = new mongoose.Schema({
UserSchema.pre('init', (next) ->
return next() unless jsonschema.properties?
for prop, sch of jsonschema.properties
+ continue if prop is 'emails' # defaults may change, so don't carry them over just yet
@set(prop, sch.default) if sch.default?
- @set('permissions', ['admin']) if not isProduction
next()
)
UserSchema.post('init', ->
@set('anonymous', false) if @get('email')
- @currentSubscriptions = JSON.stringify(@get('emailSubscriptions'))
)
UserSchema.methods.isAdmin = ->
p = @get('permissions')
return p and 'admin' in p
+emailNameMap =
+ generalNews: 'announcement'
+ adventurerNews: 'tester'
+ artisanNews: 'level_creator'
+ archmageNews: 'developer'
+ scribeNews: 'article_editor'
+ diplomatNews: 'translator'
+ ambassadorNews: 'support'
+ anyNotes: 'notification'
+
+UserSchema.methods.setEmailSubscription = (newName, enabled) ->
+ oldSubs = _.clone @get('emailSubscriptions')
+ if oldSubs and oldName = emailNameMap[newName]
+ oldSubs = (s for s in oldSubs when s isnt oldName)
+ oldSubs.push(oldName) if enabled
+ @set('emailSubscriptions', oldSubs)
+
+ newSubs = _.clone(@get('emails') or _.cloneDeep(jsonschema.properties.emails.default))
+ newSubs[newName] ?= {}
+ newSubs[newName].enabled = enabled
+ @set('emails', newSubs)
+ @newsSubsChanged = true if newName in mail.NEWS_GROUPS
+
+UserSchema.methods.isEmailSubscriptionEnabled = (newName) ->
+ emails = @get 'emails'
+ if not emails
+ oldSubs = @get('emailSubscriptions')
+ oldName = emailNameMap[newName]
+ return oldName and oldName in oldSubs if oldSubs
+ emails ?= {}
+ _.defaults emails, _.cloneDeep(jsonschema.properties.emails.default)
+ return emails[newName]?.enabled
+
UserSchema.statics.updateMailChimp = (doc, callback) ->
- return callback?() unless isProduction
+ return callback?() unless isProduction or GLOBAL.testing
return callback?() if doc.updatedMailChimp
return callback?() unless doc.get('email')
existingProps = doc.get('mailChimp')
emailChanged = (not existingProps) or existingProps?.email isnt doc.get('email')
- emailSubs = doc.get('emailSubscriptions')
- gm = mail.MAILCHIMP_GROUP_MAP
- newGroups = (gm[name] for name in emailSubs when gm[name]?)
+ return callback?() unless emailChanged or doc.newsSubsChanged
+
+ newGroups = []
+ for [mailchimpEmailGroup, emailGroup] in _.zip(mail.MAILCHIMP_GROUPS, mail.NEWS_GROUPS)
+ newGroups.push(mailchimpEmailGroup) if doc.isEmailSubscriptionEnabled(emailGroup)
+
if (not existingProps) and newGroups.length is 0
return callback?() # don't add totally unsubscribed people to the list
- subsChanged = doc.currentSubscriptions isnt JSON.stringify(emailSubs)
- return callback?() unless emailChanged or subsChanged
params = {}
params.id = mail.MAILCHIMP_LIST_ID
@@ -62,7 +95,7 @@ UserSchema.statics.updateMailChimp = (doc, callback) ->
doc.updatedMailChimp = true
callback?()
- mc.lists.subscribe params, onSuccess, onFailure
+ mc?.lists.subscribe params, onSuccess, onFailure
UserSchema.pre('save', (next) ->
@@ -74,12 +107,13 @@ UserSchema.pre('save', (next) ->
@set('password', undefined)
if @get('email') and @get('anonymous')
@set('anonymous', false)
+ @set('permissions', ['admin']) if not isProduction
data =
email_id: sendwithus.templates.welcome_email
recipient:
address: @get 'email'
sendwithus.api.send data, (err, result) ->
- log.error 'error', err, 'result', result if err
+ log.error "sendwithus post-save error: #{err}, result: #{result}" if err
next()
)
diff --git a/server/users/user_handler.coffee b/server/users/user_handler.coffee
index 168f10d91..f7723f859 100644
--- a/server/users/user_handler.coffee
+++ b/server/users/user_handler.coffee
@@ -1,4 +1,4 @@
-schema = require './user_schema'
+schema = require '../../app/schemas/models/user'
crypto = require 'crypto'
request = require 'request'
User = require './User'
@@ -9,11 +9,15 @@ errors = require '../commons/errors'
async = require 'async'
log = require 'winston'
LevelSession = require('../levels/sessions/LevelSession')
+LevelSessionHandler = require '../levels/sessions/level_session_handler'
serverProperties = ['passwordHash', 'emailLower', 'nameLower', 'passwordReset']
privateProperties = [
'permissions', 'email', 'firstName', 'lastName', 'gender', 'facebookID',
- 'gplusID', 'music', 'volume', 'aceConfig'
+ 'gplusID', 'music', 'volume', 'aceConfig', 'employerAt', 'signedEmployerAgreement'
+]
+candidateProperties = [
+ 'jobProfile', 'jobProfileApproved', 'jobProfileNotes'
]
UserHandler = class UserHandler extends Handler
@@ -21,9 +25,9 @@ UserHandler = class UserHandler extends Handler
editableProperties: [
'name', 'photoURL', 'password', 'anonymous', 'wizardColor1', 'volume',
- 'firstName', 'lastName', 'gender', 'facebookID', 'gplusID', 'emailSubscriptions',
+ 'firstName', 'lastName', 'gender', 'facebookID', 'gplusID', 'emails',
'testGroupNumber', 'music', 'hourOfCode', 'hourOfCodeComplete', 'preferredLanguage',
- 'wizard', 'aceConfig', 'autocastDelay', 'lastLevel'
+ 'wizard', 'aceConfig', 'autocastDelay', 'lastLevel', 'jobProfile'
]
jsonSchema: schema
@@ -32,21 +36,19 @@ UserHandler = class UserHandler extends Handler
super(arguments...)
@editableProperties.push('permissions') unless config.isProduction
+ getEditableProperties: (req, document) ->
+ props = super req, document
+ props.push 'jobProfileApproved', 'jobProfileNotes' if req.user.isAdmin()
+ props
+
formatEntity: (req, document) ->
return null unless document?
obj = document.toObject()
delete obj[prop] for prop in serverProperties
- includePrivates = req.user and (req.user?.isAdmin() or req.user?._id.equals(document._id))
+ includePrivates = req.user and (req.user.isAdmin() or req.user._id.equals(document._id))
delete obj[prop] for prop in privateProperties unless includePrivates
-
- # emailHash is used by gravatar
- hash = crypto.createHash('md5')
- if document.get('email')
- hash.update(_.trim(document.get('email')).toLowerCase())
- else
- hash.update(@_id+'')
- obj.emailHash = hash.digest('hex')
-
+ includeCandidate = includePrivates or (obj.jobProfileApproved and req.user and ('employer' in (req.user.get('permissions') ? [])) and @employerCanViewCandidate req.user, obj)
+ delete obj[prop] for prop in candidateProperties unless includeCandidate
return obj
waterfallFunctions: [
@@ -103,11 +105,13 @@ UserHandler = class UserHandler extends Handler
(req, user, callback) ->
return callback(null, req, user) unless req.body.name
nameLower = req.body.name?.toLowerCase()
- return callback(null, req, user) if nameLower is user.get('nameLower')
- User.findOne({nameLower:nameLower}).exec (err, otherUser) ->
+ return callback(null, req, user) unless nameLower
+ return callback(null, req, user) if nameLower is user.get('nameLower') and not user.get('anonymous')
+ User.findOne({nameLower:nameLower,anonymous:false}).exec (err, otherUser) ->
log.error "Database error setting user name: #{err}" if err
return callback(res:'Database error.', code:500) if err
r = {message:'is already used by another account', property:'name'}
+ console.log 'Another user exists' if otherUser
return callback({res:r, code:409}) if otherUser
user.set('name', req.body.name)
callback(null, req, user)
@@ -115,43 +119,56 @@ UserHandler = class UserHandler extends Handler
getById: (req, res, id) ->
if req.user?._id.equals(id)
- return @sendSuccess(res, @formatEntity(req, req.user))
+ return @sendSuccess(res, @formatEntity(req, req.user, 256))
super(req, res, id)
- getNamesByIds: (req, res) ->
+ getNamesByIDs: (req, res) ->
ids = req.query.ids or req.body.ids
- ids = ids.split(',') if _.isString ids
- ids = _.uniq ids
-
- # TODO: Extend and repurpose this handler to return other public info about a user more flexibly,
- # say by a query parameter that lists public properties to return.
returnWizard = req.query.wizard or req.body.wizard
- query = if returnWizard then {name:1, wizard:1} else {name:1}
-
- makeFunc = (id) ->
- (callback) ->
- User.findById(id, query).exec (err, document) ->
- return done(err) if err
- if document and returnWizard
- callback(null, {name:document.get('name'), wizard:document.get('wizard') or {}})
- else
- callback(null, document?.get('name') or '')
-
- funcs = {}
- for id in ids
- return errors.badInput(res, "Given an invalid id: #{id}") unless Handler.isID(id)
- funcs[id] = makeFunc(id)
-
- async.parallel funcs, (err, results) ->
- return errors.serverError err if err
- res.send results
- res.end()
+ properties = if returnWizard then "name wizard" else "name"
+ @getPropertiesFromMultipleDocuments res, User, properties, ids
nameToID: (req, res, name) ->
- User.findOne({nameLower:name.toLowerCase()}).exec (err, otherUser) ->
+ User.findOne({nameLower:name.toLowerCase(),anonymous:false}).exec (err, otherUser) ->
res.send(if otherUser then otherUser._id else JSON.stringify(''))
res.end()
+ getSimulatorLeaderboard: (req, res) ->
+ queryParameters = @getSimulatorLeaderboardQueryParameters(req)
+ leaderboardQuery = User.find(queryParameters.query).select("name simulatedBy simulatedFor").sort({"simulatedBy":queryParameters.sortOrder}).limit(queryParameters.limit)
+ leaderboardQuery.exec (err, otherUsers) ->
+ otherUsers = _.reject otherUsers, _id: req.user._id if req.query.scoreOffset isnt -1
+ otherUsers ?= []
+ res.send(otherUsers)
+ res.end()
+
+ getMySimulatorLeaderboardRank: (req, res) ->
+ req.query.order = 1
+ queryParameters = @getSimulatorLeaderboardQueryParameters(req)
+ User.count queryParameters.query, (err, count) =>
+ return @sendDatabaseError(res, err) if err
+ res.send JSON.stringify(count + 1)
+
+ getSimulatorLeaderboardQueryParameters: (req) ->
+ @validateSimulateLeaderboardRequestParameters(req)
+
+ query = {}
+ sortOrder = -1
+ limit = if req.query.limit > 30 then 30 else req.query.limit
+ if req.query.scoreOffset isnt -1
+ simulatedByQuery = {}
+ simulatedByQuery[if req.query.order is 1 then "$gt" else "$lte"] = req.query.scoreOffset
+ query.simulatedBy = simulatedByQuery
+ sortOrder = 1 if req.query.order is 1
+ else
+ query.simulatedBy = {"$exists": true}
+ {query: query, sortOrder: sortOrder, limit: limit}
+
+ validateSimulateLeaderboardRequestParameters: (req) ->
+ req.query.order = parseInt(req.query.order) ? -1
+ req.query.scoreOffset = parseFloat(req.query.scoreOffset) ? 100000
+ req.query.limit = parseInt(req.query.limit) ? 20
+
post: (req, res) ->
return @sendBadInputError(res, 'No input.') if _.isEmpty(req.body)
return @sendBadInputError(res, 'Must have an anonymous user to post with.') unless req.user
@@ -167,11 +184,16 @@ UserHandler = class UserHandler extends Handler
getByRelationship: (req, res, args...) ->
return @agreeToCLA(req, res) if args[1] is 'agreeToCLA'
+ return @agreeToEmployerAgreement(req,res) if args[1] is 'agreeToEmployerAgreement'
return @avatar(req, res, args[0]) if args[1] is 'avatar'
- return @getNamesByIds(req, res) if args[1] is 'names'
+ return @getNamesByIDs(req, res) if args[1] is 'names'
return @nameToID(req, res, args[0]) if args[1] is 'nameToID'
return @getLevelSessions(req, res, args[0]) if args[1] is 'level.sessions'
+ return @getCandidates(req, res) if args[1] is 'candidates'
+ return @getSimulatorLeaderboard(req, res, args[0]) if args[1] is 'simulatorLeaderboard'
+ return @getMySimulatorLeaderboardRank(req, res, args[0]) if args[1] is 'simulator_leaderboard_rank'
return @sendNotFoundError(res)
+ super(arguments...)
agreeToCLA: (req, res) ->
return @sendUnauthorizedError(res) unless req.user
@@ -191,9 +213,14 @@ UserHandler = class UserHandler extends Handler
@sendSuccess(res, {result:'success'})
avatar: (req, res, id) ->
- @modelClass.findById(id).exec (err, document) ->
+ @modelClass.findById(id).exec (err, document) =>
return @sendDatabaseError(res, err) if err
- res.redirect(document?.get('photoURL') or '/images/generic-wizard-icon.png')
+ photoURL = document?.get('photoURL')
+ if photoURL
+ photoURL = "/file/#{photoURL}"
+ else
+ photoURL = @buildGravatarURL document, req.query.s, req.query.fallback
+ res.redirect photoURL
res.end()
getLevelSessions: (req, res, userID) ->
@@ -205,8 +232,84 @@ UserHandler = class UserHandler extends Handler
projection[field] = 1 for field in req.query.project.split(',')
LevelSession.find(query).select(projection).exec (err, documents) =>
return @sendDatabaseError(res, err) if err
- documents = (@formatEntity(req, doc) for doc in documents)
+ documents = (LevelSessionHandler.formatEntity(req, doc) for doc in documents)
@sendSuccess(res, documents)
+ agreeToEmployerAgreement: (req, res) ->
+ userIsAnonymous = req.user?.get('anonymous')
+ if userIsAnonymous then return errors.unauthorized(res, "You need to be logged in to agree to the employer agreeement.")
+ profileData = req.body
+ #TODO: refactor this bit to make it more elegant
+ if not profileData.id or not profileData.positions or not profileData.emailAddress or not profileData.firstName or not profileData.lastName
+ return errors.badInput(res, "You need to have a more complete profile to sign up for this service.")
+ @modelClass.findById(req.user.id).exec (err, user) =>
+ if user.get('employerAt') or user.get('signedEmployerAgreement') or "employer" in user.get('permissions')
+ return errors.conflict(res, "You already have signed the agreement!")
+ #TODO: Search for the current position
+ employerAt = _.filter(profileData.positions.values,"isCurrent")[0]?.company.name ? "Not available"
+ signedEmployerAgreement =
+ linkedinID: profileData.id
+ date: new Date()
+ data: profileData
+ updateObject =
+ "employerAt": employerAt
+ "signedEmployerAgreement": signedEmployerAgreement
+ $push: "permissions":'employer'
+
+ User.update {"_id": req.user.id}, updateObject, (err, result) =>
+ if err? then return errors.serverError(res, "There was an issue updating the user object to reflect employer status: #{err}")
+ res.send({"message": "The agreement was successful."})
+ res.end()
+
+ getCandidates: (req, res) ->
+ authorized = req.user.isAdmin() or ('employer' in req.user.get('permissions'))
+ since = (new Date((new Date()) - 2 * 30.4 * 86400 * 1000)).toISOString()
+ #query = {'jobProfile.active': true, 'jobProfile.updated': {$gt: since}}
+ query = {'jobProfile.updated': {$gt: since}}
+ query.jobProfileApproved = true unless req.user.isAdmin()
+ query['jobProfile.active'] = true unless req.user.isAdmin()
+ selection = 'jobProfile'
+ selection += ' email' if authorized
+ selection += ' jobProfileApproved' if req.user.isAdmin()
+ User.find(query).select(selection).exec (err, documents) =>
+ return @sendDatabaseError(res, err) if err
+ candidates = (candidate for candidate in documents when @employerCanViewCandidate req.user, candidate.toObject())
+ candidates = (@formatCandidate(authorized, candidate) for candidate in candidates)
+ @sendSuccess(res, candidates)
+
+ formatCandidate: (authorized, document) ->
+ fields = if authorized then ['jobProfile', 'jobProfileApproved', 'photoURL', '_id'] else ['jobProfile']
+ obj = _.pick document.toObject(), fields
+ obj.photoURL ||= obj.jobProfile.photoURL if authorized
+ subfields = ['country', 'city', 'lookingFor', 'jobTitle', 'skills', 'experience', 'updated', 'active']
+ if authorized
+ subfields = subfields.concat ['name']
+ obj.jobProfile = _.pick obj.jobProfile, subfields
+ obj
+
+ employerCanViewCandidate: (employer, candidate) ->
+ return true if employer.isAdmin()
+ for job in candidate.jobProfile?.work ? []
+ # TODO: be smarter about different ways to write same company names to ensure privacy.
+ # We'll have to manually pay attention to how we set employer names for now.
+ if job.employer?.toLowerCase() is employer.get('employerAt')?.toLowerCase()
+ log.info "#{employer.get('name')} at #{employer.get('employerAt')} can't see #{candidate.jobProfile.name} because s/he worked there."
+ return false if job.employer?.toLowerCase() is employer.get('employerAt')?.toLowerCase()
+ true
+
+ buildGravatarURL: (user, size, fallback) ->
+ emailHash = @buildEmailHash user
+ fallback ?= "http://codecombat.com/file/db/thang.type/52a00d55cf1818f2be00000b/portrait.png"
+ fallback = "http://codecombat.com#{fallback}" unless /^http/.test fallback
+ "https://www.gravatar.com/avatar/#{emailHash}?s=#{size}&default=#{fallback}"
+
+ buildEmailHash: (user) ->
+ # emailHash is used by gravatar
+ hash = crypto.createHash('md5')
+ if user.get('email')
+ hash.update(_.trim(user.get('email')).toLowerCase())
+ else
+ hash.update(user.get('_id') + '')
+ hash.digest('hex')
module.exports = new UserHandler()
diff --git a/server/users/user_schema.coffee b/server/users/user_schema.coffee
deleted file mode 100644
index 18d526de5..000000000
--- a/server/users/user_schema.coffee
+++ /dev/null
@@ -1,61 +0,0 @@
-c = require '../commons/schemas'
-emailSubscriptions = ['announcement', 'tester', 'level_creator', 'developer', 'article_editor', 'translator', 'support', 'notification']
-
-UserSchema = c.object {},
- name: c.shortString({title: 'Display Name', default:''})
- email: c.shortString({title: 'Email', format: 'email'})
- firstName: c.shortString({title: 'First Name'})
- lastName: c.shortString({title: 'Last Name'})
- gender: {type: 'string', 'enum': ['male', 'female']}
- password: {type: 'string', maxLength: 256, minLength: 2, title:'Password'}
- passwordReset: {type: 'string'}
- photoURL: {type: 'string', format: 'url', required: false}
-
- facebookID: c.shortString({title: 'Facebook ID'})
- gplusID: c.shortString({title: 'G+ ID'})
-
- wizardColor1: c.pct({title: 'Wizard Clothes Color'})
- volume: c.pct({title: 'Volume'})
- music: {type: 'boolean', default: true}
- autocastDelay: {type: 'integer', 'default': 5000 }
- lastLevel: { type: 'string' }
-
- emailSubscriptions: c.array {uniqueItems: true, 'default': ['announcement', 'notification']}, {'enum': emailSubscriptions}
-
- # server controlled
- permissions: c.array {'default': []}, c.shortString()
- dateCreated: c.date({title: 'Date Joined'})
- anonymous: {type: 'boolean', 'default': true}
- testGroupNumber: {type: 'integer', minimum: 0, maximum: 256, exclusiveMaximum: true}
- mailChimp: {type: 'object'}
- hourOfCode: {type: 'boolean'}
- hourOfCodeComplete: {type: 'boolean'}
-
- emailLower: c.shortString()
- nameLower: c.shortString()
- passwordHash: {type: 'string', maxLength: 256}
-
- # client side
- #gravatarProfile: {} (should only ever be kept locally)
- emailHash: {type: 'string'}
-
- #Internationalization stuff
- preferredLanguage: {type: 'string', default: 'en', 'enum': c.getLanguageCodeArray()}
-
- signedCLA: c.date({title: 'Date Signed the CLA'})
- wizard: c.object {},
- colorConfig: c.object {additionalProperties: c.colorConfig()}
-
- aceConfig: c.object {},
- language: {type: 'string', 'default': 'javascript', 'enum': ['javascript', 'coffeescript']}
- keyBindings: {type: 'string', 'default': 'default', 'enum': ['default', 'vim', 'emacs']}
- invisibles: {type: 'boolean', 'default': false}
- indentGuides: {type: 'boolean', 'default': false}
- behaviors: {type: 'boolean', 'default': false}
-
- simulatedBy: {type: 'integer', minimum: 0, default: 0}
- simulatedFor: {type: 'integer', minimum: 0, default: 0}
-
-c.extendBasicProperties UserSchema, 'user'
-
-module.exports = UserSchema
diff --git a/server_setup.coffee b/server_setup.coffee
index c06482a85..d214497cb 100644
--- a/server_setup.coffee
+++ b/server_setup.coffee
@@ -3,6 +3,8 @@ path = require 'path'
authentication = require 'passport'
useragent = require 'express-useragent'
fs = require 'graceful-fs'
+log = require 'winston'
+compressible = require 'compressible'
database = require './server/commons/database'
baseRoute = require './server/routes/base'
@@ -10,17 +12,7 @@ user = require './server/users/user_handler'
logging = require './server/commons/logging'
config = require './server_config'
auth = require './server/routes/auth'
-UserHandler = require('./server/users/user_handler')
-
-###Middleware setup functions implementation###
-# 2014-03-03: Try not using this and see if it's still a problem
-#setupRequestTimeoutMiddleware = (app) ->
-# app.use (req, res, next) ->
-# req.setTimeout 15000, ->
-# console.log 'timed out!'
-# req.abort()
-# self.emit('pass',message)
-# next()
+UserHandler = require './server/users/user_handler'
productionLogging = (tokens, req, res) ->
status = res.statusCode
@@ -30,15 +22,17 @@ productionLogging = (tokens, req, res) ->
else if status >= 300 then color = 36
elapsed = (new Date()) - req._startTime
elapsedColor = if elapsed < 500 then 90 else 31
- if (status isnt 200 and status isnt 304) or elapsed > 500
+ if (status isnt 200 and status isnt 204 and status isnt 304 and status isnt 302) or elapsed > 500
return "\x1b[90m#{req.method} #{req.originalUrl} \x1b[#{color}m#{res.statusCode} \x1b[#{elapsedColor}m#{elapsed}ms\x1b[0m"
null
setupExpressMiddleware = (app) ->
- #setupRequestTimeoutMiddleware app
if config.isProduction
express.logger.format('prod', productionLogging)
app.use(express.logger('prod'))
+ app.use express.compress filter: (req, res) ->
+ return false if req.headers.host is 'codecombat.com' # Cloudflare will gzip it for us on codecombat.com
+ compressible res.getHeader('Content-Type')
else
app.use(express.logger('dev'))
app.use(express.static(path.join(__dirname, 'public')))
@@ -49,7 +43,6 @@ setupExpressMiddleware = (app) ->
app.use(express.bodyParser())
app.use(express.methodOverride())
app.use(express.cookieSession({secret:'defenestrate'}))
- #app.use(express.compress()) if config.isProduction # just let Cloudflare do it
setupPassportMiddleware = (app) ->
app.use(authentication.initialize())
@@ -96,9 +89,10 @@ setupFallbackRouteToIndex = (app) ->
auth.loginUser(req, res, user, false, next)
sendMain = (req, res) ->
- fs.readFile path.join(__dirname, 'public', 'main.html'), 'utf8', (err,data) ->
- # insert the user object directly into the html so the application can have it immediately
- data = data.replace('"userObjectTag"', JSON.stringify(UserHandler.formatEntity(req, req.user)))
+ fs.readFile path.join(__dirname, 'public', 'main.html'), 'utf8', (err, data) ->
+ log.error "Error modifying main.html: #{err}" if err
+ # insert the user object directly into the html so the application can have it immediately. Sanitize
+ data = data.replace('"userObjectTag"', JSON.stringify(UserHandler.formatEntity(req, req.user)).replace(/\//g, '\\/'))
res.send data
setupFacebookCrossDomainCommunicationRoute = (app) ->
diff --git a/test/app/lib/surface/camera.spec.coffee b/test/app/lib/surface/camera.spec.coffee
index 48c4439bc..8019cd38f 100644
--- a/test/app/lib/surface/camera.spec.coffee
+++ b/test/app/lib/surface/camera.spec.coffee
@@ -98,25 +98,25 @@ describe 'Camera (Surface point of view)', ->
checkCameraPos cam, wop
it 'works at 90 degrees', ->
- cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 1, null, Math.PI / 2
+ cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP
expect(cam.x2y).toBeCloseTo 1
expect(cam.x2z).toBeGreaterThan 9001
expect(cam.z2y).toBeCloseTo 0
it 'works at 0 degrees', ->
- cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 1, null, 0
+ cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP
expect(cam.x2z).toBeGreaterThan 9001
expect(cam.x2y).toBeCloseTo 1
expect(cam.z2y).toBeCloseTo 0
it 'works at 45 degrees', ->
- cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 1, null, Math.PI / 4
+ cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP
expect(cam.x2y).toBeCloseTo 1
expect(cam.x2z).toBeGreaterThan 9001
expect(cam.z2y).toBeCloseTo 0
xit 'works at default angle of asin(0.75) ~= 48.9 degrees', ->
- cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 1
+ cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP
angle = 1 / Math.cos angle
expect(cam.angle).toBeCloseTo angle
expect(cam.x2y).toBeCloseTo 1
@@ -124,7 +124,7 @@ describe 'Camera (Surface point of view)', ->
expect(cam.z2y).toBeCloseTo 0
xit 'works at 2x zoom, 90 degrees', ->
- cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 2, null, Math.PI / 2
+ cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP
checkCameraPos cam
wop = x: 5, y: 2.5, z: 7
cap = cam.worldToCanvas wop
@@ -144,7 +144,7 @@ describe 'Camera (Surface point of view)', ->
expectPositionsEqual cap, {x: 0, y: 50}
xit 'works at 2x zoom, 30 degrees', ->
- cam = new Camera 100, 100, 100 * Camera.MPP, 2 * 100 * Camera.MPP, testLayer, 2, null, Math.PI / 6
+ cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 2 * 100 * Camera.MPP
expect(cam.x2y).toBeCloseTo 1
expect(cam.x2z).toBeGreaterThan 9001
checkCameraPos cam
@@ -165,15 +165,15 @@ describe 'Camera (Surface point of view)', ->
expectPositionsEqual cap, {x: 50, y: -100}
it 'works at 2x zoom, 60 degree hFOV', ->
- cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 2, null, null, 0.01
+ cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP
checkCameraPos cam
- it 'works at 2x zoom, 60 degree hFOV, 40 degree hFOV', ->
- cam = new Camera 100, 63.041494, 100 * Camera.MPP, 63.041494 * Camera.MPP, testLayer, 2, null, null, Math.PI / 3
+ xit 'works at 2x zoom, 60 degree hFOV, 40 degree hFOV', ->
+ cam = new Camera { attr: (x) -> x is 'height' ? 63.041494 : 100 }, 100 * Camera.MPP, 63.041494 * Camera.MPP
checkCameraPos cam
xit 'works on a surface wider than it is tall, 30 degrees, default viewing upper left corner', ->
- cam = new Camera 100, 100, 200 * Camera.MPP, 2 * 50 * Camera.MPP, testLayer, 1, {x: 0, y: 0}, Math.PI / 6
+ cam = new Camera { attr: (x) -> 100 }, 200 * Camera.MPP, 2 * 50 * Camera.MPP
checkCameraPos cam
expect(cam.zoom).toBeCloseTo 2
wop = x: 5, y: 4, z: 6 * cam.y2z # like x: 5, y: 10 out of world width: 20, height: 10
diff --git a/test/server/common.coffee b/test/server/common.coffee
index d88fa21e8..dc01d8389 100644
--- a/test/server/common.coffee
+++ b/test/server/common.coffee
@@ -3,13 +3,19 @@
console.log 'IT BEGINS'
-
+require('jasmine-spec-reporter')
+jasmine.getEnv().reporter.subReporters_ = []
+jasmine.getEnv().addReporter(new jasmine.SpecReporter({
+ displaySuccessfulSpec: true,
+ displayFailedSpec: true
+ }))
GLOBAL._ = require('lodash')
_.str = require('underscore.string')
_.mixin(_.str.exports())
GLOBAL.mongoose = require 'mongoose'
mongoose.connect('mongodb://localhost/coco_unittest')
path = require('path')
+GLOBAL.testing = true
models_path = [
'../../server/articles/Article'
@@ -19,6 +25,7 @@ models_path = [
'../../server/levels/sessions/LevelSession'
'../../server/levels/thangs/LevelThangType'
'../../server/users/User'
+ '../../server/patches/Patch'
]
for m in models_path
@@ -62,13 +69,13 @@ GLOBAL.unittest = {}
unittest.users = unittest.users or {}
unittest.getNormalJoe = (done, force) ->
- unittest.getUser('normal@jo.com', 'food', done, force)
+ unittest.getUser('Joe', 'normal@jo.com', 'food', done, force)
unittest.getOtherSam = (done, force) ->
- unittest.getUser('other@sam.com', 'beer', done, force)
+ unittest.getUser('Sam', 'other@sam.com', 'beer', done, force)
unittest.getAdmin = (done, force) ->
- unittest.getUser('admin@afc.com', '80yqxpb38j', done, force)
+ unittest.getUser('Admin', 'admin@afc.com', '80yqxpb38j', done, force)
-unittest.getUser = (email, password, done, force) ->
+unittest.getUser = (name, email, password, done, force) ->
# Creates the user if it doesn't already exist.
return done(unittest.users[email]) if unittest.users[email] and not force
@@ -78,18 +85,15 @@ unittest.getUser = (email, password, done, force) ->
req = request.post(getURL('/db/user'), (err, response, body) ->
throw err if err
User.findOne({email:email}).exec((err, user) ->
- if password is '80yqxpb38j'
- user.set('permissions', [ 'admin' ])
- user.save (err) ->
- wrapUpGetUser(email, user, done)
- else
+ user.set('permissions', if password is '80yqxpb38j' then [ 'admin' ] else [])
+ user.set('name', name)
+ user.save (err) ->
wrapUpGetUser(email, user, done)
)
)
form = req.form()
form.append('email', email)
form.append('password', password)
-
wrapUpGetUser = (email, user, done) ->
unittest.users[email] = user
diff --git a/test/server/functional/article.spec.coffee b/test/server/functional/article.spec.coffee
index 377907180..a3973007b 100644
--- a/test/server/functional/article.spec.coffee
+++ b/test/server/functional/article.spec.coffee
@@ -84,3 +84,12 @@ describe '/db/article', ->
body = JSON.parse(body)
expect(body.type).toBeDefined()
done()
+
+ it 'does not allow naming an article a reserved word', (done) ->
+ loginAdmin ->
+ new_article = {name: 'Search', body:'is a reserved word'}
+ request.post {uri:url, json:new_article}, (err, res, body) ->
+ expect(res.statusCode).toBe(422)
+ done()
+
+
\ No newline at end of file
diff --git a/test/server/functional/auth.spec.coffee b/test/server/functional/auth.spec.coffee
index 18c3c7fc8..15ef44171 100644
--- a/test/server/functional/auth.spec.coffee
+++ b/test/server/functional/auth.spec.coffee
@@ -1,5 +1,6 @@
require '../common'
request = require 'request'
+User = require '../../../server/users/User'
urlLogin = getURL('/auth/login')
urlReset = getURL('/auth/reset')
@@ -16,7 +17,8 @@ describe '/auth/whoami', ->
describe '/auth/login', ->
it 'clears Users first', (done) ->
- User.remove {}, (err) ->
+ clearModels [User], (err) ->
+ throw err if err
request.get getURL('/auth/whoami'), ->
throw err if err
done()
@@ -55,7 +57,7 @@ describe '/auth/login', ->
it 'rejects wrong passwords', (done) ->
req = request.post(urlLogin, (error, response) ->
expect(response.statusCode).toBe(401)
- expect(response.body.indexOf("wrong, wrong")).toBeGreaterThan(-1)
+ expect(response.body.indexOf("wrong")).toBeGreaterThan(-1)
done()
)
form = req.form()
@@ -96,7 +98,6 @@ describe '/auth/reset', ->
it 'resets user password', (done) ->
req = request.post(urlReset, (error, response) ->
expect(response).toBeDefined()
- console.log 'status code is', response.statusCode
expect(response.statusCode).toBe(200)
expect(response.body).toBeDefined()
passwordReset = response.body
@@ -135,3 +136,21 @@ describe '/auth/reset', ->
form = req.form()
form.append('username', 'scott@gmail.com')
form.append('password', 'nada')
+
+describe '/auth/unsubscribe', ->
+ it 'clears Users first', (done) ->
+ clearModels [User], (err) ->
+ throw err if err
+ request.get getURL('/auth/whoami'), ->
+ throw err if err
+ done()
+
+ it 'removes just recruitment emails if you include ?recruitNotes=1', (done) ->
+ loginJoe (joe) ->
+ url = getURL('/auth/unsubscribe?recruitNotes=1&email='+joe.get('email'))
+ request.get url, (error, response) ->
+ expect(response.statusCode).toBe(200)
+ user = User.findOne(joe.get('_id')).exec (err, user) ->
+ expect(user.get('emails').recruitNotes.enabled).toBe(false)
+ expect(user.isEmailSubscriptionEnabled('generalNews')).toBeTruthy()
+ done()
diff --git a/test/server/functional/file.spec.coffee b/test/server/functional/file.spec.coffee
index cbabfb14e..0fb58ffd8 100644
--- a/test/server/functional/file.spec.coffee
+++ b/test/server/functional/file.spec.coffee
@@ -27,15 +27,6 @@ describe '/file', ->
dropGridFS ->
done()
- it 'can\'t be created by ordinary users.', (done) ->
- func = (err, res, body) ->
- expect(res.statusCode).toBe(403)
- expect(body.metadata).toBeUndefined()
- done()
-
- loginJoe ->
- request.post(options, func)
-
it 'can\'t be created if invalid (property path is required)', (done) ->
func = (err, res, body) ->
expect(res.statusCode).toBe(422)
diff --git a/test/server/functional/level.spec.coffee b/test/server/functional/level.spec.coffee
index 13dc6425a..edd163d0d 100644
--- a/test/server/functional/level.spec.coffee
+++ b/test/server/functional/level.spec.coffee
@@ -6,6 +6,9 @@ describe 'Level', ->
name: "King's Peak 3"
description: 'Climb a mountain.'
permissions: simplePermissions
+ scripts: []
+ thangs: []
+ documentation: {specificArticles:[], generalArticles:[]}
urlLevel = '/db/level'
diff --git a/test/server/functional/level_component.spec.coffee b/test/server/functional/level_component.spec.coffee
index 4850d834c..9127ccefd 100644
--- a/test/server/functional/level_component.spec.coffee
+++ b/test/server/functional/level_component.spec.coffee
@@ -3,11 +3,14 @@ require '../common'
describe 'LevelComponent', ->
component =
- name:'Bashes Everything'
+ name:'BashesEverything'
description:'Makes the unit uncontrollably bash anything bashable, using the bash system.'
code: 'bash();'
- language: 'javascript'
+ language: 'coffeescript'
permissions:simplePermissions
+ propertyDocumentation: []
+ system: 'ai'
+ dependencies: []
components = {}
@@ -45,7 +48,7 @@ describe 'LevelComponent', ->
it 'have a unique name.', (done) ->
loginAdmin ->
request.post {uri:url, json:component}, (err, res, body) ->
- expect(res.statusCode).toBe(422)
+ expect(res.statusCode).toBe(409)
done()
it 'can be read by an admin.', (done) ->
diff --git a/test/server/functional/level_system.spec.coffee b/test/server/functional/level_system.spec.coffee
index 32ca61df1..229c3a39d 100644
--- a/test/server/functional/level_system.spec.coffee
+++ b/test/server/functional/level_system.spec.coffee
@@ -11,6 +11,8 @@ describe 'LevelSystem', ->
"""
language: 'coffeescript'
permissions:simplePermissions
+ dependencies: []
+ propertyDocumentation: []
systems = {}
@@ -48,7 +50,7 @@ describe 'LevelSystem', ->
it 'have a unique name.', (done) ->
loginAdmin ->
request.post {uri:url, json:system}, (err, res, body) ->
- expect(res.statusCode).toBe(422)
+ expect(res.statusCode).toBe(409)
done()
it 'can be read by an admin.', (done) ->
diff --git a/test/server/functional/mail.spec.coffee b/test/server/functional/mail.spec.coffee
new file mode 100644
index 000000000..0910aab6f
--- /dev/null
+++ b/test/server/functional/mail.spec.coffee
@@ -0,0 +1,38 @@
+require '../common'
+mail = require '../../../server/routes/mail'
+User = require '../../../server/users/User'
+
+testPost =
+ data:
+ email: 'scott@codecombat.com'
+ id: '12345678'
+ merges:
+ INTERESTS: 'Announcements, Adventurers, Archmages, Scribes, Diplomats, Ambassadors, Artisans'
+ FNAME: 'Scott'
+ LNAME: 'Erickson'
+
+describe 'handleProfileUpdate', ->
+ it 'updates emails from the data passed in', (done) ->
+ u = new User()
+ mail.handleProfileUpdate(u, testPost)
+ expect(u.isEmailSubscriptionEnabled('generalNews')).toBeTruthy()
+ expect(u.isEmailSubscriptionEnabled('adventurerNews')).toBeTruthy()
+ expect(u.isEmailSubscriptionEnabled('archmageNews')).toBeTruthy()
+ expect(u.isEmailSubscriptionEnabled('scribeNews')).toBeTruthy()
+ expect(u.isEmailSubscriptionEnabled('diplomatNews')).toBeTruthy()
+ expect(u.isEmailSubscriptionEnabled('ambassadorNews')).toBeTruthy()
+ expect(u.isEmailSubscriptionEnabled('artisanNews')).toBeTruthy()
+ done()
+
+describe 'handleUnsubscribe', ->
+ it 'turns off all news and notifications', (done) ->
+ u = new User({generalNews: {enabled:true}, archmageNews: {enabled:true}, anyNotes: {enabled:true}})
+ mail.handleUnsubscribe(u)
+ expect(u.isEmailSubscriptionEnabled('generalNews')).toBeFalsy()
+ expect(u.isEmailSubscriptionEnabled('adventurerNews')).toBeFalsy()
+ expect(u.isEmailSubscriptionEnabled('archmageNews')).toBeFalsy()
+ expect(u.isEmailSubscriptionEnabled('scribeNews')).toBeFalsy()
+ expect(u.isEmailSubscriptionEnabled('diplomatNews')).toBeFalsy()
+ expect(u.isEmailSubscriptionEnabled('ambassadorNews')).toBeFalsy()
+ expect(u.isEmailSubscriptionEnabled('artisanNews')).toBeFalsy()
+ done()
diff --git a/test/server/functional/patch.spec.coffee b/test/server/functional/patch.spec.coffee
new file mode 100644
index 000000000..9d0f4265d
--- /dev/null
+++ b/test/server/functional/patch.spec.coffee
@@ -0,0 +1,119 @@
+require '../common'
+
+describe '/db/patch', ->
+ request = require 'request'
+ it 'clears the db first', (done) ->
+ clearModels [User, Article, Patch], (err) ->
+ throw err if err
+ done()
+
+ article = {name: 'Yo', body:'yo ma'}
+ articleURL = getURL('/db/article')
+ articles = {}
+
+ patchURL = getURL('/db/patch')
+ patches = {}
+ patch =
+ commitMessage: 'Accept this patch!'
+ delta: {name:['test']}
+ editPath: '/who/knows/yes'
+ target:
+ id:null
+ collection: 'article'
+
+ it 'creates an Article to patch', (done) ->
+ loginAdmin ->
+ request.post {uri:articleURL, json:article}, (err, res, body) ->
+ articles[0] = body
+ patch.target.id = articles[0]._id
+ done()
+
+ it "allows someone to submit a patch to something they don't control", (done) ->
+ loginJoe (joe) ->
+ request.post {uri: patchURL, json: patch}, (err, res, body) ->
+ expect(res.statusCode).toBe(200)
+ expect(body.target.original).toBeDefined()
+ expect(body.target.version.major).toBeDefined()
+ expect(body.target.version.minor).toBeDefined()
+ expect(body.status).toBe('pending')
+ expect(body.created).toBeDefined()
+ expect(body.creator).toBe(joe.id)
+ patches[0] = body
+ done()
+
+ it 'adds a patch to the target document', (done) ->
+ Article.findOne({}).exec (err, article) ->
+ expect(article.toObject().patches[0]).toBeDefined()
+ done()
+
+ it 'shows up in patch requests', (done) ->
+ patchesURL = getURL("/db/article/#{articles[0]._id}/patches")
+ request.get {uri: patchesURL}, (err, res, body) ->
+ body = JSON.parse(body)
+ expect(res.statusCode).toBe(200)
+ expect(body.length).toBe(1)
+ done()
+
+ it 'allows you to set yourself as watching', (done) ->
+ watchingURL = getURL("/db/article/#{articles[0]._id}/watch")
+ request.put {uri: watchingURL, json: {on:true}}, (err, res, body) ->
+ expect(body.watchers[1]).toBeDefined()
+ done()
+
+ it 'added the watcher to the target document', (done) ->
+ Article.findOne({}).exec (err, article) ->
+ expect(article.toObject().watchers[1]).toBeDefined()
+ done()
+
+ it 'does not add duplicate watchers', (done) ->
+ watchingURL = getURL("/db/article/#{articles[0]._id}/watch")
+ request.put {uri: watchingURL, json: {on:true}}, (err, res, body) ->
+ expect(body.watchers.length).toBe(2)
+ done()
+
+ it 'allows removing yourself', (done) ->
+ watchingURL = getURL("/db/article/#{articles[0]._id}/watch")
+ request.put {uri: watchingURL, json: {on:false}}, (err, res, body) ->
+ expect(body.watchers.length).toBe(1)
+ done()
+
+ it 'allows the submitter to withdraw the pull request', (done) ->
+ statusURL = getURL("/db/patch/#{patches[0]._id}/status")
+ request.put {uri: statusURL, json: {status:'withdrawn'}}, (err, res, body) ->
+ expect(res.statusCode).toBe(200)
+ Patch.findOne({}).exec (err, article) ->
+ expect(article.get('status')).toBe 'withdrawn'
+ Article.findOne({}).exec (err, article) ->
+ expect(article.toObject().patches.length).toBe(0)
+ done()
+
+ it 'does not allow the submitter to reject or accept the pull request', (done) ->
+ statusURL = getURL("/db/patch/#{patches[0]._id}/status")
+ request.put {uri: statusURL, json: {status:'rejected'}}, (err, res, body) ->
+ expect(res.statusCode).toBe(403)
+ request.put {uri: statusURL, json: {status:'accepted'}}, (err, res, body) ->
+ expect(res.statusCode).toBe(403)
+ Patch.findOne({}).exec (err, article) ->
+ expect(article.get('status')).toBe 'withdrawn'
+ done()
+
+ it 'allows the recipient to accept or reject the pull request', (done) ->
+ statusURL = getURL("/db/patch/#{patches[0]._id}/status")
+ loginAdmin ->
+ request.put {uri: statusURL, json: {status:'rejected'}}, (err, res, body) ->
+ expect(res.statusCode).toBe(200)
+ Patch.findOne({}).exec (err, article) ->
+ expect(article.get('status')).toBe 'rejected'
+ request.put {uri: statusURL, json: {status:'accepted'}}, (err, res, body) ->
+ expect(res.statusCode).toBe(200)
+ Patch.findOne({}).exec (err, article) ->
+ expect(article.get('status')).toBe 'accepted'
+ done()
+
+ it 'does not allow the recipient to withdraw the pull request', (done) ->
+ statusURL = getURL("/db/patch/#{patches[0]._id}/status")
+ request.put {uri: statusURL, json: {status:'withdrawn'}}, (err, res, body) ->
+ expect(res.statusCode).toBe(403)
+ Patch.findOne({}).exec (err, article) ->
+ expect(article.get('status')).toBe 'accepted'
+ done()
\ No newline at end of file
diff --git a/test/server/functional/user.spec.coffee b/test/server/functional/user.spec.coffee
index 29e1360a9..03a88242d 100644
--- a/test/server/functional/user.spec.coffee
+++ b/test/server/functional/user.spec.coffee
@@ -1,10 +1,63 @@
require '../common'
request = require 'request'
+User = require '../../../server/users/User'
urlUser = '/db/user'
+describe 'Server user object', ->
+
+ it 'uses the schema defaults to fill in email preferences', (done) ->
+ user = new User()
+ expect(user.isEmailSubscriptionEnabled('generalNews')).toBeTruthy()
+ expect(user.isEmailSubscriptionEnabled('anyNotes')).toBeTruthy()
+ expect(user.isEmailSubscriptionEnabled('recruitNotes')).toBeTruthy()
+ expect(user.isEmailSubscriptionEnabled('archmageNews')).toBeFalsy()
+ done()
+
+ it 'uses old subs if they\'re around', (done) ->
+ user = new User()
+ user.set 'emailSubscriptions', ['tester']
+ expect(user.isEmailSubscriptionEnabled('adventurerNews')).toBeTruthy()
+ expect(user.isEmailSubscriptionEnabled('generalNews')).toBeFalsy()
+ done()
+
+ it 'maintains the old subs list if it\'s around', (done) ->
+ user = new User()
+ user.set 'emailSubscriptions', ['tester']
+ user.setEmailSubscription('artisanNews', true)
+ expect(JSON.stringify(user.get('emailSubscriptions'))).toBe(JSON.stringify(['tester','level_creator']))
+ done()
+
+describe 'User.updateMailChimp', ->
+ makeMC = (callback) ->
+ GLOBAL.mc =
+ lists:
+ subscribe: callback
+
+ it 'uses emails to determine what to send to MailChimp', (done) ->
+ makeMC (params) ->
+ expect(JSON.stringify(params.merge_vars.groupings[0].groups)).toBe(JSON.stringify(['Announcements']))
+ done()
+
+ user = new User({emailSubscriptions:['announcement'], email:'tester@gmail.com'})
+ User.updateMailChimp(user)
+
describe 'POST /db/user', ->
+ createAnonNameUser = (done)->
+ request.post getURL('/auth/logout'), ->
+ request.get getURL('/auth/whoami'), ->
+ req = request.post(getURL('/db/user'), (err, response) ->
+ expect(response.statusCode).toBe(200)
+ request.get getURL('/auth/whoami'), (request, response, body) ->
+ res = JSON.parse(response.body)
+ expect(res.anonymous).toBeTruthy()
+ expect(res.name).toEqual('Jim')
+ done()
+ )
+ form = req.form()
+ form.append('name', 'Jim')
+
it 'preparing test : clears the db first', (done) ->
clearModels [User], (err) ->
throw err if err
@@ -51,6 +104,36 @@ describe 'POST /db/user', ->
expect(user.passwordHash).toBeUndefined()
done()
+ it 'should allow setting anonymous user name', (done) ->
+ createAnonNameUser(done)
+
+ it 'should allow multiple anonymous users with same name', (done) ->
+ createAnonNameUser(done)
+
+
+ it 'should not allow setting existing user name to anonymous user', (done) ->
+
+ createAnonUser = ->
+ request.post getURL('/auth/logout'), ->
+ request.get getURL('/auth/whoami'), ->
+ req = request.post(getURL('/db/user'), (err, response) ->
+ expect(response.statusCode).toBe(409)
+ done()
+ )
+ form = req.form()
+ form.append('name', 'Jim')
+
+ req = request.post(getURL('/db/user'), (err,response,body) ->
+ expect(response.statusCode).toBe(200)
+ request.get getURL('/auth/whoami'), (request, response, body) ->
+ res = JSON.parse(response.body)
+ expect(res.anonymous).toBeFalsy()
+ createAnonUser()
+ )
+ form = req.form()
+ form.append('email', 'new@user.com')
+ form.append('password', 'new')
+
describe 'PUT /db/user', ->
@@ -108,11 +191,20 @@ ghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghl
form.append('_id', String(admin._id))
form.append('email', joe.get('email').toUpperCase())
- it 'works', (done) ->
+ it 'does not care if you include your existing name', (done) ->
+ unittest.getNormalJoe (joe) ->
+ req = request.put getURL(urlUser+'/'+joe._id), (err, res) ->
+ expect(res.statusCode).toBe(200)
+ done()
+ form = req.form()
+ form.append('_id', String(joe._id))
+ form.append('name', 'Joe')
+
+ it 'accepts name and email changes', (done) ->
unittest.getNormalJoe (joe) ->
req = request.put getURL(urlUser), (err, res) ->
expect(res.statusCode).toBe(200)
- unittest.getUser('New@email.com', 'null', (joe) ->
+ unittest.getUser('Wilhelm', 'New@email.com', 'null', (joe) ->
expect(joe.get('name')).toBe('Wilhelm')
expect(joe.get('emailLower')).toBe('new@email.com')
expect(joe.get('email')).toBe('New@email.com')
@@ -122,7 +214,6 @@ ghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghl
form.append('email', 'New@email.com')
form.append('name', 'Wilhelm')
-
describe 'GET /db/user', ->
it 'logs in as admin', (done) ->
diff --git a/vendor/scripts/antiscroll.js b/vendor/scripts/antiscroll.js
deleted file mode 100644
index 2de1812d6..000000000
--- a/vendor/scripts/antiscroll.js
+++ /dev/null
@@ -1,471 +0,0 @@
-(function ($) {
-
- /**
- * Augment jQuery prototype.
- */
-
- $.fn.antiscroll = function (options) {
- return this.each(function () {
- if ($(this).data('antiscroll')) {
- $(this).data('antiscroll').destroy();
- }
-
- $(this).data('antiscroll', new $.Antiscroll(this, options));
- });
- };
-
- /**
- * Expose constructor.
- */
-
- $.Antiscroll = Antiscroll;
-
- /**
- * Antiscroll pane constructor.
- *
- * @param {Element|jQuery} main pane
- * @parma {Object} options
- * @api public
- */
-
- function Antiscroll (el, opts) {
- this.el = $(el);
- this.options = opts || {};
-
- this.x = (false !== this.options.x) || this.options.forceHorizontal;
- this.y = (false !== this.options.y) || this.options.forceVertical;
- this.autoHide = false !== this.options.autoHide;
- this.padding = undefined == this.options.padding ? 2 : this.options.padding;
-
- this.inner = this.el.find('.antiscroll-inner');
- this.inner.css({
- 'width': '+=' + (this.y ? scrollbarSize() : 0)
- , 'height': '+=' + (this.x ? scrollbarSize() : 0)
- });
-
- this.refresh();
- };
-
- /**
- * refresh scrollbars
- *
- * @api public
- */
-
- Antiscroll.prototype.refresh = function() {
- var needHScroll = this.inner.get(0).scrollWidth > this.el.width() + (this.y ? scrollbarSize() : 0),
- needVScroll = this.inner.get(0).scrollHeight > this.el.height() + (this.x ? scrollbarSize() : 0);
-
- if (this.x) {
- if (!this.horizontal && needHScroll) {
- this.horizontal = new Scrollbar.Horizontal(this);
- } else if (this.horizontal && !needHScroll) {
- this.horizontal.destroy();
- this.horizontal = null;
- } else if (this.horizontal) {
- this.horizontal.update();
- }
- }
-
- if (this.y) {
- if (!this.vertical && needVScroll) {
- this.vertical = new Scrollbar.Vertical(this);
- } else if (this.vertical && !needVScroll) {
- this.vertical.destroy();
- this.vertical = null;
- } else if (this.vertical) {
- this.vertical.update();
- }
- }
- };
-
- /**
- * Cleans up.
- *
- * @return {Antiscroll} for chaining
- * @api public
- */
-
- Antiscroll.prototype.destroy = function () {
- if (this.horizontal) {
- this.horizontal.destroy();
- this.horizontal = null
- }
- if (this.vertical) {
- this.vertical.destroy();
- this.vertical = null
- }
- return this;
- };
-
- /**
- * Rebuild Antiscroll.
- *
- * @return {Antiscroll} for chaining
- * @api public
- */
-
- Antiscroll.prototype.rebuild = function () {
- this.destroy();
- this.inner.attr('style', '');
- Antiscroll.call(this, this.el, this.options);
- return this;
- };
-
- /**
- * Scrollbar constructor.
- *
- * @param {Element|jQuery} element
- * @api public
- */
-
- function Scrollbar (pane) {
- this.pane = pane;
- this.pane.el.append(this.el);
- this.innerEl = this.pane.inner.get(0);
-
- this.dragging = false;
- this.enter = false;
- this.shown = false;
-
- // hovering
- this.pane.el.mouseenter($.proxy(this, 'mouseenter'));
- this.pane.el.mouseleave($.proxy(this, 'mouseleave'));
-
- // dragging
- this.el.mousedown($.proxy(this, 'mousedown'));
-
- // scrolling
- this.innerPaneScrollListener = $.proxy(this, 'scroll');
- this.pane.inner.scroll(this.innerPaneScrollListener);
-
- // wheel -optional-
- this.innerPaneMouseWheelListener = $.proxy(this, 'mousewheel');
- this.pane.inner.bind('mousewheel', this.innerPaneMouseWheelListener);
-
- // show
- var initialDisplay = this.pane.options.initialDisplay;
-
- if (initialDisplay !== false) {
- this.show();
- if (this.pane.autoHide) {
- this.hiding = setTimeout($.proxy(this, 'hide'), parseInt(initialDisplay, 10) || 3000);
- }
- }
- };
-
- /**
- * Cleans up.
- *
- * @return {Scrollbar} for chaining
- * @api public
- */
-
- Scrollbar.prototype.destroy = function () {
- this.el.remove();
- this.pane.inner.unbind('scroll', this.innerPaneScrollListener);
- this.pane.inner.unbind('mousewheel', this.innerPaneMouseWheelListener);
- return this;
- };
-
- /**
- * Called upon mouseenter.
- *
- * @api private
- */
-
- Scrollbar.prototype.mouseenter = function () {
- this.enter = true;
- this.show();
- };
-
- /**
- * Called upon mouseleave.
- *
- * @api private
- */
-
- Scrollbar.prototype.mouseleave = function () {
- this.enter = false;
-
- if (!this.dragging) {
- if (this.pane.autoHide) {
- this.hide();
- }
- }
- };
-
- /**
- * Called upon wrap scroll.
- *
- * @api private
- */
-
- Scrollbar.prototype.scroll = function () {
- if (!this.shown) {
- this.show();
- if (!this.enter && !this.dragging) {
- if (this.pane.autoHide) {
- this.hiding = setTimeout($.proxy(this, 'hide'), 1500);
- }
- }
- }
-
- this.update();
- };
-
- /**
- * Called upon scrollbar mousedown.
- *
- * @api private
- */
-
- Scrollbar.prototype.mousedown = function (ev) {
- ev.preventDefault();
-
- this.dragging = true;
-
- this.startPageY = ev.pageY - parseInt(this.el.css('top'), 10);
- this.startPageX = ev.pageX - parseInt(this.el.css('left'), 10);
-
- // prevent crazy selections on IE
- this.el[0].ownerDocument.onselectstart = function () { return false; };
-
- var pane = this.pane,
- move = $.proxy(this, 'mousemove'),
- self = this
-
- $(this.el[0].ownerDocument)
- .mousemove(move)
- .mouseup(function () {
- self.dragging = false;
- this.onselectstart = null;
-
- $(this).unbind('mousemove', move);
-
- if (!self.enter) {
- self.hide();
- }
- });
- };
-
- /**
- * Show scrollbar.
- *
- * @api private
- */
-
- Scrollbar.prototype.show = function (duration) {
- if (!this.shown && this.update()) {
- this.el.addClass('antiscroll-scrollbar-shown');
- if (this.hiding) {
- clearTimeout(this.hiding);
- this.hiding = null;
- }
- this.shown = true;
- }
- };
-
- /**
- * Hide scrollbar.
- *
- * @api private
- */
-
- Scrollbar.prototype.hide = function () {
- if (this.pane.autoHide !== false && this.shown) {
- // check for dragging
- this.el.removeClass('antiscroll-scrollbar-shown');
- this.shown = false;
- }
- };
-
- /**
- * Horizontal scrollbar constructor
- *
- * @api private
- */
-
- Scrollbar.Horizontal = function (pane) {
- this.el = $('', pane.el);
- Scrollbar.call(this, pane);
- };
-
- /**
- * Inherits from Scrollbar.
- */
-
- inherits(Scrollbar.Horizontal, Scrollbar);
-
- /**
- * Updates size/position of scrollbar.
- *
- * @api private
- */
-
- Scrollbar.Horizontal.prototype.update = function () {
- var paneWidth = this.pane.el.width(),
- trackWidth = paneWidth - this.pane.padding * 2,
- innerEl = this.pane.inner.get(0)
-
- this.el
- .css('width', trackWidth * paneWidth / innerEl.scrollWidth)
- .css('left', trackWidth * innerEl.scrollLeft / innerEl.scrollWidth);
-
- return paneWidth < innerEl.scrollWidth;
- };
-
- /**
- * Called upon drag.
- *
- * @api private
- */
-
- Scrollbar.Horizontal.prototype.mousemove = function (ev) {
- var trackWidth = this.pane.el.width() - this.pane.padding * 2,
- pos = ev.pageX - this.startPageX,
- barWidth = this.el.width(),
- innerEl = this.pane.inner.get(0)
-
- // minimum top is 0, maximum is the track height
- var y = Math.min(Math.max(pos, 0), trackWidth - barWidth);
-
- innerEl.scrollLeft = (innerEl.scrollWidth - this.pane.el.width())
- * y / (trackWidth - barWidth);
- };
-
- /**
- * Called upon container mousewheel.
- *
- * @api private
- */
-
- Scrollbar.Horizontal.prototype.mousewheel = function (ev, delta, x, y) {
- if ((x < 0 && 0 == this.pane.inner.get(0).scrollLeft) ||
- (x > 0 && (this.innerEl.scrollLeft + Math.ceil(this.pane.el.width())
- == this.innerEl.scrollWidth))) {
- ev.preventDefault();
- return false;
- }
- };
-
- /**
- * Vertical scrollbar constructor
- *
- * @api private
- */
-
- Scrollbar.Vertical = function (pane) {
- this.el = $('', pane.el);
- Scrollbar.call(this, pane);
- };
-
- /**
- * Inherits from Scrollbar.
- */
-
- inherits(Scrollbar.Vertical, Scrollbar);
-
- /**
- * Updates size/position of scrollbar.
- *
- * @api private
- */
-
- Scrollbar.Vertical.prototype.update = function () {
- var paneHeight = this.pane.el.height(),
- trackHeight = paneHeight - this.pane.padding * 2,
- innerEl = this.innerEl;
-
- var scrollbarHeight = trackHeight * paneHeight / innerEl.scrollHeight;
- scrollbarHeight = scrollbarHeight < 20 ? 20 : scrollbarHeight;
-
- var topPos = trackHeight * innerEl.scrollTop / innerEl.scrollHeight;
-
- if((topPos + scrollbarHeight) > trackHeight) {
- var diff = (topPos + scrollbarHeight) - trackHeight;
- topPos = topPos - diff - 3;
- }
-
- this.el
- .css('height', scrollbarHeight)
- .css('top', topPos);
-
- return paneHeight < innerEl.scrollHeight;
- };
-
- /**
- * Called upon drag.
- *
- * @api private
- */
-
- Scrollbar.Vertical.prototype.mousemove = function (ev) {
- var paneHeight = this.pane.el.height(),
- trackHeight = paneHeight - this.pane.padding * 2,
- pos = ev.pageY - this.startPageY,
- barHeight = this.el.height(),
- innerEl = this.innerEl
-
- // minimum top is 0, maximum is the track height
- var y = Math.min(Math.max(pos, 0), trackHeight - barHeight);
-
- innerEl.scrollTop = (innerEl.scrollHeight - paneHeight)
- * y / (trackHeight - barHeight);
- };
-
- /**
- * Called upon container mousewheel.
- *
- * @api private
- */
-
- Scrollbar.Vertical.prototype.mousewheel = function (ev, delta, x, y) {
- if ((y > 0 && 0 == this.innerEl.scrollTop) ||
- (y < 0 && (this.innerEl.scrollTop + Math.ceil(this.pane.el.height())
- == this.innerEl.scrollHeight))) {
- ev.preventDefault();
- return false;
- }
- };
-
- /**
- * Cross-browser inheritance.
- *
- * @param {Function} constructor
- * @param {Function} constructor we inherit from
- * @api private
- */
-
- function inherits (ctorA, ctorB) {
- function f() {};
- f.prototype = ctorB.prototype;
- ctorA.prototype = new f;
- };
-
- /**
- * Scrollbar size detection.
- */
-
- var size;
-
- function scrollbarSize () {
- if (size === undefined) {
- var div = $(
- ''
- + ''
- );
-
- $('body').append(div);
- var w1 = $(div).innerWidth();
- var w2 = $('div', div).innerWidth();
- $(div).remove();
-
- size = w1 - w2;
- }
-
- return size;
- };
-
-})(jQuery);
diff --git a/vendor/scripts/async.js b/vendor/scripts/async.js
new file mode 100644
index 000000000..2bb5395db
--- /dev/null
+++ b/vendor/scripts/async.js
@@ -0,0 +1,1043 @@
+/*jshint onevar: false, indent:4 */
+/*global setImmediate: false, setTimeout: false, console: false */
+(function () {
+
+ var async = {};
+
+ // global on the server, window in the browser
+ var root, previous_async;
+
+ root = this;
+ if (root != null) {
+ previous_async = root.async;
+ }
+
+ async.noConflict = function () {
+ root.async = previous_async;
+ return async;
+ };
+
+ function only_once(fn) {
+ var called = false;
+ return function() {
+ if (called) throw new Error("Callback was already called.");
+ called = true;
+ fn.apply(root, arguments);
+ }
+ }
+
+ //// cross-browser compatiblity functions ////
+
+ var _toString = Object.prototype.toString;
+
+ var _isArray = Array.isArray || function (obj) {
+ return _toString.call(obj) === '[object Array]';
+ };
+
+ var _each = function (arr, iterator) {
+ if (arr.forEach) {
+ return arr.forEach(iterator);
+ }
+ for (var i = 0; i < arr.length; i += 1) {
+ iterator(arr[i], i, arr);
+ }
+ };
+
+ var _map = function (arr, iterator) {
+ if (arr.map) {
+ return arr.map(iterator);
+ }
+ var results = [];
+ _each(arr, function (x, i, a) {
+ results.push(iterator(x, i, a));
+ });
+ return results;
+ };
+
+ var _reduce = function (arr, iterator, memo) {
+ if (arr.reduce) {
+ return arr.reduce(iterator, memo);
+ }
+ _each(arr, function (x, i, a) {
+ memo = iterator(memo, x, i, a);
+ });
+ return memo;
+ };
+
+ var _keys = function (obj) {
+ if (Object.keys) {
+ return Object.keys(obj);
+ }
+ var keys = [];
+ for (var k in obj) {
+ if (obj.hasOwnProperty(k)) {
+ keys.push(k);
+ }
+ }
+ return keys;
+ };
+
+ //// exported async module functions ////
+
+ //// nextTick implementation with browser-compatible fallback ////
+ if (typeof process === 'undefined' || !(process.nextTick)) {
+ if (typeof setImmediate === 'function') {
+ async.nextTick = function (fn) {
+ // not a direct alias for IE10 compatibility
+ setImmediate(fn);
+ };
+ async.setImmediate = async.nextTick;
+ }
+ else {
+ async.nextTick = function (fn) {
+ setTimeout(fn, 0);
+ };
+ async.setImmediate = async.nextTick;
+ }
+ }
+ else {
+ async.nextTick = process.nextTick;
+ if (typeof setImmediate !== 'undefined') {
+ async.setImmediate = function (fn) {
+ // not a direct alias for IE10 compatibility
+ setImmediate(fn);
+ };
+ }
+ else {
+ async.setImmediate = async.nextTick;
+ }
+ }
+
+ async.each = function (arr, iterator, callback) {
+ callback = callback || function () {};
+ if (!arr.length) {
+ return callback();
+ }
+ var completed = 0;
+ _each(arr, function (x) {
+ iterator(x, only_once(done) );
+ });
+ function done(err) {
+ if (err) {
+ callback(err);
+ callback = function () {};
+ }
+ else {
+ completed += 1;
+ if (completed >= arr.length) {
+ callback();
+ }
+ }
+ }
+ };
+ async.forEach = async.each;
+
+ async.eachSeries = function (arr, iterator, callback) {
+ callback = callback || function () {};
+ if (!arr.length) {
+ return callback();
+ }
+ var completed = 0;
+ var iterate = function () {
+ iterator(arr[completed], function (err) {
+ if (err) {
+ callback(err);
+ callback = function () {};
+ }
+ else {
+ completed += 1;
+ if (completed >= arr.length) {
+ callback();
+ }
+ else {
+ iterate();
+ }
+ }
+ });
+ };
+ iterate();
+ };
+ async.forEachSeries = async.eachSeries;
+
+ async.eachLimit = function (arr, limit, iterator, callback) {
+ var fn = _eachLimit(limit);
+ fn.apply(null, [arr, iterator, callback]);
+ };
+ async.forEachLimit = async.eachLimit;
+
+ var _eachLimit = function (limit) {
+
+ return function (arr, iterator, callback) {
+ callback = callback || function () {};
+ if (!arr.length || limit <= 0) {
+ return callback();
+ }
+ var completed = 0;
+ var started = 0;
+ var running = 0;
+
+ (function replenish () {
+ if (completed >= arr.length) {
+ return callback();
+ }
+
+ while (running < limit && started < arr.length) {
+ started += 1;
+ running += 1;
+ iterator(arr[started - 1], function (err) {
+ if (err) {
+ callback(err);
+ callback = function () {};
+ }
+ else {
+ completed += 1;
+ running -= 1;
+ if (completed >= arr.length) {
+ callback();
+ }
+ else {
+ replenish();
+ }
+ }
+ });
+ }
+ })();
+ };
+ };
+
+
+ var doParallel = function (fn) {
+ return function () {
+ var args = Array.prototype.slice.call(arguments);
+ return fn.apply(null, [async.each].concat(args));
+ };
+ };
+ var doParallelLimit = function(limit, fn) {
+ return function () {
+ var args = Array.prototype.slice.call(arguments);
+ return fn.apply(null, [_eachLimit(limit)].concat(args));
+ };
+ };
+ var doSeries = function (fn) {
+ return function () {
+ var args = Array.prototype.slice.call(arguments);
+ return fn.apply(null, [async.eachSeries].concat(args));
+ };
+ };
+
+
+ var _asyncMap = function (eachfn, arr, iterator, callback) {
+ var results = [];
+ arr = _map(arr, function (x, i) {
+ return {index: i, value: x};
+ });
+ eachfn(arr, function (x, callback) {
+ iterator(x.value, function (err, v) {
+ results[x.index] = v;
+ callback(err);
+ });
+ }, function (err) {
+ callback(err, results);
+ });
+ };
+ async.map = doParallel(_asyncMap);
+ async.mapSeries = doSeries(_asyncMap);
+ async.mapLimit = function (arr, limit, iterator, callback) {
+ return _mapLimit(limit)(arr, iterator, callback);
+ };
+
+ var _mapLimit = function(limit) {
+ return doParallelLimit(limit, _asyncMap);
+ };
+
+ // reduce only has a series version, as doing reduce in parallel won't
+ // work in many situations.
+ async.reduce = function (arr, memo, iterator, callback) {
+ async.eachSeries(arr, function (x, callback) {
+ iterator(memo, x, function (err, v) {
+ memo = v;
+ callback(err);
+ });
+ }, function (err) {
+ callback(err, memo);
+ });
+ };
+ // inject alias
+ async.inject = async.reduce;
+ // foldl alias
+ async.foldl = async.reduce;
+
+ async.reduceRight = function (arr, memo, iterator, callback) {
+ var reversed = _map(arr, function (x) {
+ return x;
+ }).reverse();
+ async.reduce(reversed, memo, iterator, callback);
+ };
+ // foldr alias
+ async.foldr = async.reduceRight;
+
+ var _filter = function (eachfn, arr, iterator, callback) {
+ var results = [];
+ arr = _map(arr, function (x, i) {
+ return {index: i, value: x};
+ });
+ eachfn(arr, function (x, callback) {
+ iterator(x.value, function (v) {
+ if (v) {
+ results.push(x);
+ }
+ callback();
+ });
+ }, function (err) {
+ callback(_map(results.sort(function (a, b) {
+ return a.index - b.index;
+ }), function (x) {
+ return x.value;
+ }));
+ });
+ };
+ async.filter = doParallel(_filter);
+ async.filterSeries = doSeries(_filter);
+ // select alias
+ async.select = async.filter;
+ async.selectSeries = async.filterSeries;
+
+ var _reject = function (eachfn, arr, iterator, callback) {
+ var results = [];
+ arr = _map(arr, function (x, i) {
+ return {index: i, value: x};
+ });
+ eachfn(arr, function (x, callback) {
+ iterator(x.value, function (v) {
+ if (!v) {
+ results.push(x);
+ }
+ callback();
+ });
+ }, function (err) {
+ callback(_map(results.sort(function (a, b) {
+ return a.index - b.index;
+ }), function (x) {
+ return x.value;
+ }));
+ });
+ };
+ async.reject = doParallel(_reject);
+ async.rejectSeries = doSeries(_reject);
+
+ var _detect = function (eachfn, arr, iterator, main_callback) {
+ eachfn(arr, function (x, callback) {
+ iterator(x, function (result) {
+ if (result) {
+ main_callback(x);
+ main_callback = function () {};
+ }
+ else {
+ callback();
+ }
+ });
+ }, function (err) {
+ main_callback();
+ });
+ };
+ async.detect = doParallel(_detect);
+ async.detectSeries = doSeries(_detect);
+
+ async.some = function (arr, iterator, main_callback) {
+ async.each(arr, function (x, callback) {
+ iterator(x, function (v) {
+ if (v) {
+ main_callback(true);
+ main_callback = function () {};
+ }
+ callback();
+ });
+ }, function (err) {
+ main_callback(false);
+ });
+ };
+ // any alias
+ async.any = async.some;
+
+ async.every = function (arr, iterator, main_callback) {
+ async.each(arr, function (x, callback) {
+ iterator(x, function (v) {
+ if (!v) {
+ main_callback(false);
+ main_callback = function () {};
+ }
+ callback();
+ });
+ }, function (err) {
+ main_callback(true);
+ });
+ };
+ // all alias
+ async.all = async.every;
+
+ async.sortBy = function (arr, iterator, callback) {
+ async.map(arr, function (x, callback) {
+ iterator(x, function (err, criteria) {
+ if (err) {
+ callback(err);
+ }
+ else {
+ callback(null, {value: x, criteria: criteria});
+ }
+ });
+ }, function (err, results) {
+ if (err) {
+ return callback(err);
+ }
+ else {
+ var fn = function (left, right) {
+ var a = left.criteria, b = right.criteria;
+ return a < b ? -1 : a > b ? 1 : 0;
+ };
+ callback(null, _map(results.sort(fn), function (x) {
+ return x.value;
+ }));
+ }
+ });
+ };
+
+ async.auto = function (tasks, callback) {
+ callback = callback || function () {};
+ var keys = _keys(tasks);
+ var remainingTasks = keys.length
+ if (!remainingTasks) {
+ return callback();
+ }
+
+ var results = {};
+
+ var listeners = [];
+ var addListener = function (fn) {
+ listeners.unshift(fn);
+ };
+ var removeListener = function (fn) {
+ for (var i = 0; i < listeners.length; i += 1) {
+ if (listeners[i] === fn) {
+ listeners.splice(i, 1);
+ return;
+ }
+ }
+ };
+ var taskComplete = function () {
+ remainingTasks--
+ _each(listeners.slice(0), function (fn) {
+ fn();
+ });
+ };
+
+ addListener(function () {
+ if (!remainingTasks) {
+ var theCallback = callback;
+ // prevent final callback from calling itself if it errors
+ callback = function () {};
+
+ theCallback(null, results);
+ }
+ });
+
+ _each(keys, function (k) {
+ var task = _isArray(tasks[k]) ? tasks[k]: [tasks[k]];
+ var taskCallback = function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
+ if (err) {
+ var safeResults = {};
+ _each(_keys(results), function(rkey) {
+ safeResults[rkey] = results[rkey];
+ });
+ safeResults[k] = args;
+ callback(err, safeResults);
+ // stop subsequent errors hitting callback multiple times
+ callback = function () {};
+ }
+ else {
+ results[k] = args;
+ async.setImmediate(taskComplete);
+ }
+ };
+ var requires = task.slice(0, Math.abs(task.length - 1)) || [];
+ var ready = function () {
+ return _reduce(requires, function (a, x) {
+ return (a && results.hasOwnProperty(x));
+ }, true) && !results.hasOwnProperty(k);
+ };
+ if (ready()) {
+ task[task.length - 1](taskCallback, results);
+ }
+ else {
+ var listener = function () {
+ if (ready()) {
+ removeListener(listener);
+ task[task.length - 1](taskCallback, results);
+ }
+ };
+ addListener(listener);
+ }
+ });
+ };
+
+ async.retry = function(times, task, callback) {
+ var DEFAULT_TIMES = 5;
+ var attempts = [];
+ // Use defaults if times not passed
+ if (typeof times === 'function') {
+ callback = task;
+ task = times;
+ times = DEFAULT_TIMES;
+ }
+ // Make sure times is a number
+ times = parseInt(times, 10) || DEFAULT_TIMES;
+ var wrappedTask = function(wrappedCallback, wrappedResults) {
+ var retryAttempt = function(task, finalAttempt) {
+ return function(seriesCallback) {
+ task(function(err, result){
+ seriesCallback(!err || finalAttempt, {err: err, result: result});
+ }, wrappedResults);
+ };
+ };
+ while (times) {
+ attempts.push(retryAttempt(task, !(times-=1)));
+ }
+ async.series(attempts, function(done, data){
+ data = data[data.length - 1];
+ (wrappedCallback || callback)(data.err, data.result);
+ });
+ }
+ // If a callback is passed, run this as a controll flow
+ return callback ? wrappedTask() : wrappedTask
+ };
+
+ async.waterfall = function (tasks, callback) {
+ callback = callback || function () {};
+ if (!_isArray(tasks)) {
+ var err = new Error('First argument to waterfall must be an array of functions');
+ return callback(err);
+ }
+ if (!tasks.length) {
+ return callback();
+ }
+ var wrapIterator = function (iterator) {
+ return function (err) {
+ if (err) {
+ callback.apply(null, arguments);
+ callback = function () {};
+ }
+ else {
+ var args = Array.prototype.slice.call(arguments, 1);
+ var next = iterator.next();
+ if (next) {
+ args.push(wrapIterator(next));
+ }
+ else {
+ args.push(callback);
+ }
+ async.setImmediate(function () {
+ iterator.apply(null, args);
+ });
+ }
+ };
+ };
+ wrapIterator(async.iterator(tasks))();
+ };
+
+ var _parallel = function(eachfn, tasks, callback) {
+ callback = callback || function () {};
+ if (_isArray(tasks)) {
+ eachfn.map(tasks, function (fn, callback) {
+ if (fn) {
+ fn(function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
+ callback.call(null, err, args);
+ });
+ }
+ }, callback);
+ }
+ else {
+ var results = {};
+ eachfn.each(_keys(tasks), function (k, callback) {
+ tasks[k](function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
+ results[k] = args;
+ callback(err);
+ });
+ }, function (err) {
+ callback(err, results);
+ });
+ }
+ };
+
+ async.parallel = function (tasks, callback) {
+ _parallel({ map: async.map, each: async.each }, tasks, callback);
+ };
+
+ async.parallelLimit = function(tasks, limit, callback) {
+ _parallel({ map: _mapLimit(limit), each: _eachLimit(limit) }, tasks, callback);
+ };
+
+ async.series = function (tasks, callback) {
+ callback = callback || function () {};
+ if (_isArray(tasks)) {
+ async.mapSeries(tasks, function (fn, callback) {
+ if (fn) {
+ fn(function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
+ callback.call(null, err, args);
+ });
+ }
+ }, callback);
+ }
+ else {
+ var results = {};
+ async.eachSeries(_keys(tasks), function (k, callback) {
+ tasks[k](function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
+ results[k] = args;
+ callback(err);
+ });
+ }, function (err) {
+ callback(err, results);
+ });
+ }
+ };
+
+ async.iterator = function (tasks) {
+ var makeCallback = function (index) {
+ var fn = function () {
+ if (tasks.length) {
+ tasks[index].apply(null, arguments);
+ }
+ return fn.next();
+ };
+ fn.next = function () {
+ return (index < tasks.length - 1) ? makeCallback(index + 1): null;
+ };
+ return fn;
+ };
+ return makeCallback(0);
+ };
+
+ async.apply = function (fn) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ return function () {
+ return fn.apply(
+ null, args.concat(Array.prototype.slice.call(arguments))
+ );
+ };
+ };
+
+ var _concat = function (eachfn, arr, fn, callback) {
+ var r = [];
+ eachfn(arr, function (x, cb) {
+ fn(x, function (err, y) {
+ r = r.concat(y || []);
+ cb(err);
+ });
+ }, function (err) {
+ callback(err, r);
+ });
+ };
+ async.concat = doParallel(_concat);
+ async.concatSeries = doSeries(_concat);
+
+ async.whilst = function (test, iterator, callback) {
+ if (test()) {
+ iterator(function (err) {
+ if (err) {
+ return callback(err);
+ }
+ async.whilst(test, iterator, callback);
+ });
+ }
+ else {
+ callback();
+ }
+ };
+
+ async.doWhilst = function (iterator, test, callback) {
+ iterator(function (err) {
+ if (err) {
+ return callback(err);
+ }
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (test.apply(null, args)) {
+ async.doWhilst(iterator, test, callback);
+ }
+ else {
+ callback();
+ }
+ });
+ };
+
+ async.until = function (test, iterator, callback) {
+ if (!test()) {
+ iterator(function (err) {
+ if (err) {
+ return callback(err);
+ }
+ async.until(test, iterator, callback);
+ });
+ }
+ else {
+ callback();
+ }
+ };
+
+ async.doUntil = function (iterator, test, callback) {
+ iterator(function (err) {
+ if (err) {
+ return callback(err);
+ }
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (!test.apply(null, args)) {
+ async.doUntil(iterator, test, callback);
+ }
+ else {
+ callback();
+ }
+ });
+ };
+
+ async.queue = function (worker, concurrency) {
+ if (concurrency === undefined) {
+ concurrency = 1;
+ }
+ function _insert(q, data, pos, callback) {
+ if (!q.started){
+ q.started = true;
+ }
+ if (!_isArray(data)) {
+ data = [data];
+ }
+ if(data.length == 0) {
+ // call drain immediately if there are no tasks
+ return async.setImmediate(function() {
+ if (q.drain) {
+ q.drain();
+ }
+ });
+ }
+ _each(data, function(task) {
+ var item = {
+ data: task,
+ callback: typeof callback === 'function' ? callback : null
+ };
+
+ if (pos) {
+ q.tasks.unshift(item);
+ } else {
+ q.tasks.push(item);
+ }
+
+ if (q.saturated && q.tasks.length === q.concurrency) {
+ q.saturated();
+ }
+ async.setImmediate(q.process);
+ });
+ }
+
+ var workers = 0;
+ var q = {
+ tasks: [],
+ concurrency: concurrency,
+ saturated: null,
+ empty: null,
+ drain: null,
+ started: false,
+ paused: false,
+ push: function (data, callback) {
+ _insert(q, data, false, callback);
+ },
+ kill: function () {
+ q.drain = null;
+ q.tasks = [];
+ },
+ unshift: function (data, callback) {
+ _insert(q, data, true, callback);
+ },
+ process: function () {
+ if (!q.paused && workers < q.concurrency && q.tasks.length) {
+ var task = q.tasks.shift();
+ if (q.empty && q.tasks.length === 0) {
+ q.empty();
+ }
+ workers += 1;
+ var next = function () {
+ workers -= 1;
+ if (task.callback) {
+ task.callback.apply(task, arguments);
+ }
+ if (q.drain && q.tasks.length + workers === 0) {
+ q.drain();
+ }
+ q.process();
+ };
+ var cb = only_once(next);
+ worker(task.data, cb);
+ }
+ },
+ length: function () {
+ return q.tasks.length;
+ },
+ running: function () {
+ return workers;
+ },
+ idle: function() {
+ return q.tasks.length + workers === 0;
+ },
+ pause: function () {
+ if (q.paused === true) { return; }
+ q.paused = true;
+ q.process();
+ },
+ resume: function () {
+ if (q.paused === false) { return; }
+ q.paused = false;
+ q.process();
+ }
+ };
+ return q;
+ };
+
+ async.cargo = function (worker, payload) {
+ var working = false,
+ tasks = [];
+
+ var cargo = {
+ tasks: tasks,
+ payload: payload,
+ saturated: null,
+ empty: null,
+ drain: null,
+ drained: true,
+ push: function (data, callback) {
+ if (!_isArray(data)) {
+ data = [data];
+ }
+ _each(data, function(task) {
+ tasks.push({
+ data: task,
+ callback: typeof callback === 'function' ? callback : null
+ });
+ cargo.drained = false;
+ if (cargo.saturated && tasks.length === payload) {
+ cargo.saturated();
+ }
+ });
+ async.setImmediate(cargo.process);
+ },
+ process: function process() {
+ if (working) return;
+ if (tasks.length === 0) {
+ if(cargo.drain && !cargo.drained) cargo.drain();
+ cargo.drained = true;
+ return;
+ }
+
+ var ts = typeof payload === 'number'
+ ? tasks.splice(0, payload)
+ : tasks.splice(0, tasks.length);
+
+ var ds = _map(ts, function (task) {
+ return task.data;
+ });
+
+ if(cargo.empty) cargo.empty();
+ working = true;
+ worker(ds, function () {
+ working = false;
+
+ var args = arguments;
+ _each(ts, function (data) {
+ if (data.callback) {
+ data.callback.apply(null, args);
+ }
+ });
+
+ process();
+ });
+ },
+ length: function () {
+ return tasks.length;
+ },
+ running: function () {
+ return working;
+ }
+ };
+ return cargo;
+ };
+
+ var _console_fn = function (name) {
+ return function (fn) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ fn.apply(null, args.concat([function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (typeof console !== 'undefined') {
+ if (err) {
+ if (console.error) {
+ console.error(err);
+ }
+ }
+ else if (console[name]) {
+ _each(args, function (x) {
+ console[name](x);
+ });
+ }
+ }
+ }]));
+ };
+ };
+ async.log = _console_fn('log');
+ async.dir = _console_fn('dir');
+ /*async.info = _console_fn('info');
+ async.warn = _console_fn('warn');
+ async.error = _console_fn('error');*/
+
+ async.memoize = function (fn, hasher) {
+ var memo = {};
+ var queues = {};
+ hasher = hasher || function (x) {
+ return x;
+ };
+ var memoized = function () {
+ var args = Array.prototype.slice.call(arguments);
+ var callback = args.pop();
+ var key = hasher.apply(null, args);
+ if (key in memo) {
+ async.nextTick(function () {
+ callback.apply(null, memo[key]);
+ });
+ }
+ else if (key in queues) {
+ queues[key].push(callback);
+ }
+ else {
+ queues[key] = [callback];
+ fn.apply(null, args.concat([function () {
+ memo[key] = arguments;
+ var q = queues[key];
+ delete queues[key];
+ for (var i = 0, l = q.length; i < l; i++) {
+ q[i].apply(null, arguments);
+ }
+ }]));
+ }
+ };
+ memoized.memo = memo;
+ memoized.unmemoized = fn;
+ return memoized;
+ };
+
+ async.unmemoize = function (fn) {
+ return function () {
+ return (fn.unmemoized || fn).apply(null, arguments);
+ };
+ };
+
+ async.times = function (count, iterator, callback) {
+ var counter = [];
+ for (var i = 0; i < count; i++) {
+ counter.push(i);
+ }
+ return async.map(counter, iterator, callback);
+ };
+
+ async.timesSeries = function (count, iterator, callback) {
+ var counter = [];
+ for (var i = 0; i < count; i++) {
+ counter.push(i);
+ }
+ return async.mapSeries(counter, iterator, callback);
+ };
+
+ async.seq = function (/* functions... */) {
+ var fns = arguments;
+ return function () {
+ var that = this;
+ var args = Array.prototype.slice.call(arguments);
+ var callback = args.pop();
+ async.reduce(fns, args, function (newargs, fn, cb) {
+ fn.apply(that, newargs.concat([function () {
+ var err = arguments[0];
+ var nextargs = Array.prototype.slice.call(arguments, 1);
+ cb(err, nextargs);
+ }]))
+ },
+ function (err, results) {
+ callback.apply(that, [err].concat(results));
+ });
+ };
+ };
+
+ async.compose = function (/* functions... */) {
+ return async.seq.apply(null, Array.prototype.reverse.call(arguments));
+ };
+
+ var _applyEach = function (eachfn, fns /*args...*/) {
+ var go = function () {
+ var that = this;
+ var args = Array.prototype.slice.call(arguments);
+ var callback = args.pop();
+ return eachfn(fns, function (fn, cb) {
+ fn.apply(that, args.concat([cb]));
+ },
+ callback);
+ };
+ if (arguments.length > 2) {
+ var args = Array.prototype.slice.call(arguments, 2);
+ return go.apply(this, args);
+ }
+ else {
+ return go;
+ }
+ };
+ async.applyEach = doParallel(_applyEach);
+ async.applyEachSeries = doSeries(_applyEach);
+
+ async.forever = function (fn, callback) {
+ function next(err) {
+ if (err) {
+ if (callback) {
+ return callback(err);
+ }
+ throw err;
+ }
+ fn(next);
+ }
+ next();
+ };
+
+ // Node.js
+ if (typeof module !== 'undefined' && module.exports) {
+ module.exports = async;
+ }
+ // AMD / RequireJS
+ else if (typeof define !== 'undefined' && define.amd) {
+ define([], function () {
+ return async;
+ });
+ }
+ // included directly via
"))
- window.tracker?.trackEvent 'Hour of Code Begin', {}
+ @setUpHourOfCode()
@isEditorPreview = @getQueryVariable 'dev'
@sessionID = @getQueryVariable 'session'
$(window).on('resize', @onWindowResize)
- @listenToOnce(@supermodel, 'error', @onLevelLoadError)
@saveScreenshot = _.throttle @saveScreenshot, 30000
if @isEditorPreview
- f = =>
- @supermodel.shouldSaveBackups = (model) ->
- model.constructor.className in ['Level', 'LevelComponent', 'LevelSystem']
- @load() unless @levelLoader
+ # wait to see if it's just given to us through setLevel
+ f = => @load() unless @levelLoader
setTimeout f, 100
else
@load()
+ application.tracker?.trackEvent 'Started Level Load', level: @levelID, label: @levelID
- onLevelLoadError: (e) ->
- application.router.navigate "/play?not_found=#{@levelID}", {trigger: true}
+ setUpHourOfCode: ->
+ me.set 'hourOfCode', true
+ me.save()
+ $('body').append($("'))
- initSurface: ->
- surfaceCanvas = $('canvas#surface', @$el)
- @surface = new Surface(@world, surfaceCanvas, thangTypes: @supermodel.getModels(ThangType), playJingle: not @isEditorPreview)
- worldBounds = @world.getBounds()
- bounds = [{x:worldBounds.left, y:worldBounds.top}, {x:worldBounds.right, y:worldBounds.bottom}]
- @surface.camera.setBounds(bounds)
- @surface.camera.zoomTo({x:0, y:0}, 0.1, 0)
-
- initGoalManager: ->
- @goalManager = new GoalManager(@world, @level.get('goals'))
- @god.goalManager = @goalManager
-
- initScriptManager: ->
- @scriptManager = new ScriptManager({scripts: @world.scripts or [], view:@, session: @session})
- @scriptManager.loadFromSession()
-
- initVolume: ->
- volume = me.get('volume')
- volume = 1.0 unless volume?
- Backbone.Mediator.publish 'level-set-volume', volume: volume
-
- onSurfaceSetUpNewWorld: ->
- return if @alreadyLoadedState
- @alreadyLoadedState = true
- state = @originalSessionState
- if state.frame
- Backbone.Mediator.publish 'level-set-time', { time: 0, frameOffset: state.frame }
- if state.selected
- # TODO: Should also restore selected spell here by saving spellName
- Backbone.Mediator.publish 'level-select-sprite', { thangID: state.selected, spellName: null }
- if state.playing?
- Backbone.Mediator.publish 'level-set-playing', { playing: state.playing }
-
preloadNextLevel: =>
# TODO: Loading models in the middle of gameplay causes stuttering. Most of the improvement in loading time is simply from passing the supermodel from this level to the next, but if we can find a way to populate the level early without it being noticeable, that would be even better.
# return if @destroyed
@@ -436,34 +473,24 @@ module.exports = class PlayLevelView extends View
# @supermodel.populateModel nextLevel
# @preloaded = true
- register: ->
- @bus = LevelBus.get(@levelID, @session.id)
- @bus.setSession(@session)
- @bus.setSpells @tome.spells
- @bus.connect() if @session.get('multiplayer')
-
onSessionWillSave: (e) ->
# Something interesting has happened, so (at a lower frequency), we'll save a screenshot.
- @saveScreenshot e.session
+ #@saveScreenshot e.session
# Throttled
saveScreenshot: (session) =>
return unless screenshot = @surface?.screenshot()
session.save {screenshot: screenshot}, {patch: true}
- setTeam: (team) ->
- team = team?.team unless _.isString team
- team ?= 'humans'
- me.team = team
- Backbone.Mediator.publish 'level:team-set', team: team
-
# Dynamic sound loading
- loadSoundsForWorld: (e) ->
+ onNewWorld: (e) ->
return if @headless
- world = e.world
+ scripts = @world.scripts # Since these worlds don't have scripts, preserve them.
+ @world = e.world
+ @world.scripts = scripts
thangTypes = @supermodel.getModels(ThangType)
- for [spriteName, message] in world.thangDialogueSounds()
+ for [spriteName, message] in @world.thangDialogueSounds()
continue unless thangType = _.find thangTypes, (m) -> m.get('name') is spriteName
continue unless sound = AudioPlayer.soundForDialogue message, thangType.get('soundTriggers')
AudioPlayer.preloadSoundReference sound
diff --git a/app/views/play/spectate_view.coffee b/app/views/play/spectate_view.coffee
index da6f5e611..76e5430ca 100644
--- a/app/views/play/spectate_view.coffee
+++ b/app/views/play/spectate_view.coffee
@@ -8,7 +8,7 @@ World = require 'lib/world/world'
# tools
Surface = require 'lib/surface/Surface'
-God = require 'lib/God'
+God = require 'lib/God' # 'lib/Buddha'
GoalManager = require 'lib/world/GoalManager'
ScriptManager = require 'lib/scripts/ScriptManager'
LevelLoader = require 'lib/LevelLoader'
@@ -90,9 +90,9 @@ module.exports = class SpectateLevelView extends View
application.router.navigate "/play?not_found=#{@levelID}", {trigger: true}
setLevel: (@level, @supermodel) ->
- @god?.level = @level.serialize @supermodel
+ serializedLevel = @level.serialize @supermodel
+ @god?.setLevel serializedLevel
if @world
- serializedLevel = @level.serialize(@supermodel)
@world.loadFromLevel serializedLevel, false
else
@load()
@@ -106,8 +106,7 @@ module.exports = class SpectateLevelView extends View
spectateMode: true
team: @getQueryVariable("team")
@listenToOnce(@levelLoader, 'loaded-all', @onLevelLoaderLoaded)
- @listenTo(@levelLoader, 'progress', @onLevelLoaderProgressChanged)
- @god = new God maxWorkerPoolSize: 1, maxAngels: 1
+ @god = new God maxAngels: 1
getRenderData: ->
c = super()
@@ -119,8 +118,10 @@ module.exports = class SpectateLevelView extends View
@insertSubView @loadingView = new LoadingView {}
@$el.find('#level-done-button').hide()
super()
+ $('body').addClass('is-playing')
- onLevelLoaderProgressChanged: ->
+ updateProgress: (progress) ->
+ super(progress)
return if @seenDocs
return unless showFrequency = @levelLoader.level.get('showGuide')
session = @levelLoader.session
@@ -140,7 +141,10 @@ module.exports = class SpectateLevelView extends View
Backbone.Mediator.subscribeOnce 'modal-closed', @onLevelLoaderLoaded, @
return true
- onLevelLoaderLoaded: ->
+ onLoaded: ->
+ _.defer => @onLevelLoaded()
+
+ onLevelLoaded: ->
return unless @levelLoader.progress() is 1 # double check, since closing the guide may trigger this early
# Save latest level played in local storage
if window.currentModal and not window.currentModal.destroyed
@@ -151,13 +155,14 @@ module.exports = class SpectateLevelView extends View
#at this point, all requisite data is loaded, and sessions are not denormalized
team = @world.teamForPlayer(0)
@loadOpponentTeam(team)
- @god.level = @level.serialize @supermodel
- @god.worldClassMap = @world.classMap
+ @god.setLevel @level.serialize @supermodel
+ @god.setLevelSessionIDs if @otherSession then [@session.id, @otherSession.id] else [@session.id]
+ @god.setWorldClassMap @world.classMap
@setTeam team
@initSurface()
@initGoalManager()
@initScriptManager()
- @insertSubviews ladderGame: @otherSession?
+ @insertSubviews()
@initVolume()
@originalSessionState = $.extend(true, {}, @session.get('state'))
@@ -191,13 +196,14 @@ module.exports = class SpectateLevelView extends View
continue if spellTeam is myTeam or not myTeam
opponentSpells = opponentSpells.concat spells
- opponentCode = @otherSession?.get('submittedCode') or {}
- myCode = @session.get('submittedCode') or {}
+ opponentCode = @otherSession?.get('transpiledCode') or {}
+ myCode = @session.get('transpiledCode') or {}
for spell in opponentSpells
[thang, spell] = spell.split '/'
c = opponentCode[thang]?[spell]
myCode[thang] ?= {}
if c then myCode[thang][spell] = c else delete myCode[thang][spell]
+
@session.set('code', myCode)
if @session.get('multiplayer') and @otherSession?
# For now, ladderGame will disallow multiplayer, because session code combining doesn't play nice yet.
@@ -207,8 +213,9 @@ module.exports = class SpectateLevelView extends View
@loadingView?.unveil()
onLoadingViewUnveiled: (e) ->
- @removeSubView @loadingView
- @loadingView = null
+ # Don't remove it; we want its decoration around on large screens.
+ #@removeSubView @loadingView
+ #@loadingView = null
onSupermodelLoadedOne: =>
@modelsLoaded ?= 0
@@ -224,8 +231,8 @@ module.exports = class SpectateLevelView extends View
ctx.clearRect(0, 0, canvas.width, canvas.height)
ctx.fillText("Loaded #{@modelsLoaded} thingies",50,50)
- insertSubviews: (subviewOptions) ->
- @insertSubView @tome = new TomeView levelID: @levelID, session: @session, thangs: @world.thangs, supermodel: @supermodel, ladderGame: subviewOptions.ladderGame
+ insertSubviews: ->
+ @insertSubView @tome = new TomeView levelID: @levelID, session: @session, thangs: @world.thangs, supermodel: @supermodel, spectateView: true
@insertSubView new PlaybackView {}
@insertSubView new GoldView {}
@@ -382,7 +389,7 @@ module.exports = class SpectateLevelView extends View
initGoalManager: ->
@goalManager = new GoalManager(@world, @level.get('goals'))
- @god.goalManager = @goalManager
+ @god.setGoalManager @goalManager
initScriptManager: ->
if @world.scripts
diff --git a/app/views/play_view.coffee b/app/views/play_view.coffee
index 349f900c7..8662ecef4 100644
--- a/app/views/play_view.coffee
+++ b/app/views/play_view.coffee
@@ -1,7 +1,7 @@
View = require 'views/kinds/RootView'
template = require 'templates/play'
LevelSession = require 'models/LevelSession'
-CocoCollection = require 'models/CocoCollection'
+CocoCollection = require 'collections/CocoCollection'
class LevelSessionsCollection extends CocoCollection
url: ''
@@ -138,11 +138,19 @@ module.exports = class PlayView extends View
difficulty: 5
id: 'gridmancer'
image: '/file/db/level/52ae2460ef42c52f13000008/gridmancer_icon.png'
- description: "Challenge! Beat this level, get a job!"
+ description: "Super algorithm challenge level!"
}
]
arenas = [
+ {
+ name: 'Greed'
+ difficulty: 4
+ id: 'greed'
+ image: '/file/db/level/526fd3043c637ece50001bb2/the_herd_icon.png'
+ description: "Liked Dungeon Arena and Gold Rush? Put them together in this economic arena!"
+ levelPath: 'ladder'
+ }
{
name: 'Dungeon Arena'
difficulty: 3
@@ -151,6 +159,14 @@ module.exports = class PlayView extends View
description: "Play head-to-head against fellow Wizards in a dungeon melee!"
levelPath: 'ladder'
}
+ {
+ name: 'Gold Rush'
+ difficulty: 3
+ id: 'gold-rush'
+ image: '/file/db/level/52602ecb026e8481e7000001/generic_1.png'
+ description: "Prove you are better at collecting gold than your opponent!"
+ levelPath: 'ladder'
+ }
{
name: 'Brawlwood'
difficulty: 4
@@ -204,6 +220,21 @@ module.exports = class PlayView extends View
image: '/file/db/level/526fd3043c637ece50001bb2/the_herd_icon.png'
description: "Transfer a stack of ogres while preserving their honor. - by Alexandru"
}
+ {
+ name: 'Find the Spy'
+ difficulty: 2
+ id: 'find-the-spy'
+ image: '/file/db/level/526ae95c1e5cd30000000008/zone_of_danger_icon.png'
+ description: "Identify the spies hidden among your soldiers - by Nathan Gossett"
+ }
+ {
+ name: 'Harvest Time'
+ difficulty: 2
+ id: 'harvest-time'
+ image: '/file/db/level/529662dfe0df8f0000000007/grab_the_mushroom_icon.png'
+ description: "Collect a hundred mushrooms in just five lines of code - by Nathan Gossett"
+ }
+
#{
# name: 'Enemy Artillery'
# difficulty: 1
diff --git a/bin/coco-brunch b/bin/coco-brunch
index 6ebf85db5..9afe5e7c7 100755
--- a/bin/coco-brunch
+++ b/bin/coco-brunch
@@ -9,7 +9,7 @@ import sys
current_directory = os.path.dirname(os.path.realpath(sys.argv[0]))
coco_path = os.getenv("COCO_DIR",os.path.join(current_directory,os.pardir))
brunch_path = coco_path + os.sep + "node_modules" + os.sep + ".bin" + os.sep + "brunch"
-subprocess.Popen("ulimit -n 10000",shell=True)
+subprocess.Popen("ulimit -n 100000",shell=True)
while True:
print("Starting brunch. After the first compile, it'll keep running and watch for changes.")
call(brunch_path + " w",shell=True,cwd=coco_path)
diff --git a/bin/coco-dev-server b/bin/coco-dev-server
index c76923672..e30367130 100755
--- a/bin/coco-dev-server
+++ b/bin/coco-dev-server
@@ -8,5 +8,5 @@ current_directory = os.path.dirname(os.path.realpath(sys.argv[0]))
coco_path = os.getenv("COCO_DIR",os.path.join(current_directory,os.pardir))
nodemon_path = coco_path + os.sep + "node_modules" + os.sep + ".bin" + os.sep + "nodemon"
-call(nodemon_path + " . --ext \".coffee|.js\" --watch server --watch app.js --watch server_config.js --watch server_setup.coffee",shell=True,cwd=coco_path)
+call(nodemon_path + " . --ext \".coffee|.js\" --watch server --watch server_config.js --watch server_setup.coffee --watch app" + os.sep + "schemas",shell=True,cwd=coco_path)
diff --git a/bower.json b/bower.json
index e73834bc5..f04a51d91 100644
--- a/bower.json
+++ b/bower.json
@@ -24,19 +24,26 @@
"test"
],
"dependencies": {
- "jquery": "~2.0.3",
+ "jquery": "~2.1.0",
"lodash": "~2.4.1",
"backbone": "1.1.0",
"jquery-mousewheel": "~3.1.9",
- "i18next": "~1.7.1",
+ "i18next": "git://github.com/nwinter/i18next.git",
"firepad": "~0.1.2",
"marked": "~0.3.0",
"moment": "~2.5.0",
- "aether": "~0.1.18",
+ "aether": "~0.2.8",
"underscore.string": "~2.3.3",
"firebase": "~1.0.2",
"catiline": "~2.9.3",
- "d3": "~3.4.4"
+ "d3": "~3.4.4",
+ "jsondiffpatch": "~0.1.5",
+ "nanoscroller": "~0.8.0",
+ "jquery.tablesorter": "~2.15.13",
+ "treema": "~0.0.8",
+ "bootstrap": "~3.1.1",
+ "validated-backbone-mediator": "~0.1.3",
+ "jquery.browser": "~0.0.6"
},
"overrides": {
"backbone": {
@@ -50,6 +57,29 @@
},
"underscore.string": {
"main": "lib/underscore.string.js"
+ },
+ "jsondiffpatch": {
+ "main": [
+ "build/bundle-full.js",
+ "build/formatters.js",
+ "src/formatters/html.css"
+ ]
+ },
+ "jquery.tablesorter": {
+ "main": [
+ "js/jquery.tablesorter.js",
+ "js/jquery.tablesorter.widgets.js",
+ "css/theme.bootstrap.css"
+ ]
+ },
+ "bootstrap": {
+ "main": [
+ "./dist/js/bootstrap.js",
+ "./dist/fonts/glyphicons-halflings-regular.eot",
+ "./dist/fonts/glyphicons-halflings-regular.svg",
+ "./dist/fonts/glyphicons-halflings-regular.ttf",
+ "./dist/fonts/glyphicons-halflings-regular.woff"
+ ]
}
}
}
diff --git a/config.coffee b/config.coffee
index 1a860cb76..55b9888b4 100644
--- a/config.coffee
+++ b/config.coffee
@@ -11,6 +11,7 @@ exports.config =
ignored: (path) -> startsWith(sysPath.basename(path), '_')
workers:
enabled: false # turned out to be much, much slower than without workers
+ sourceMaps: true
files:
javascripts:
defaultExtension: 'coffee'
@@ -21,58 +22,54 @@ exports.config =
|(app[\/\\]lib[\/\\]utils.coffee)
|(vendor[\/\\]scripts[\/\\]Box2dWeb-2.1.a.3)
|(vendor[\/\\]scripts[\/\\]string_score.js)
- |(bower_components[\/\\]lodash[\/\\]dist[\/\\]lodash.js)
- |(bower_components[\/\\]aether[\/\\]build[\/\\]aether.js)
)///
'javascripts/app.js': /^app/
'javascripts/vendor.js': ///^(
vendor[\/\\](?!scripts[\/\\]Box2d)
- |bower_components
+ |bower_components[\/\\](?!aether)
)///
'javascripts/vendor_with_box2d.js': ///^(
vendor[\/\\]
- |bower_components # include box2dweb for profiling (and for IE9...)
+ |bower_components[\/\\](?!aether) # include box2dweb for profiling (and for IE9...)
)///
- 'javascripts/tome_aether.js': ///^(
+ 'javascripts/lodash.js': ///^(
(bower_components[\/\\]lodash[\/\\]dist[\/\\]lodash.js)
- |(bower_components[\/\\]aether[\/\\]build[\/\\]aether.js)
)///
- 'test/javascripts/test.js': /^test[\/\\](?!vendor)/
- 'test/javascripts/test-vendor.js': /^test[\/\\](?=vendor)/
+ 'javascripts/aether.js': ///^(
+ (bower_components[\/\\]aether[\/\\]build[\/\\]aether.js)
+ )///
+# 'test/javascripts/test.js': /^test[\/\\](?!vendor)/
+# 'test/javascripts/test-vendor.js': /^test[\/\\](?=vendor)/
order:
before: [
- 'bower_components/jquery/jquery.js'
+ 'bower_components/jquery/dist/jquery.js'
'bower_components/lodash/dist/lodash.js'
'bower_components/backbone/backbone.js'
# Twitter Bootstrap jquery plugins
- 'vendor/scripts/bootstrap/transition.js'
- 'vendor/scripts/bootstrap/affix.js'
- 'vendor/scripts/bootstrap/alert.js'
- 'vendor/scripts/bootstrap/button.js'
- 'vendor/scripts/bootstrap/carousel.js'
- 'vendor/scripts/bootstrap/collapse.js'
- 'vendor/scripts/bootstrap/dropdown.js'
- 'vendor/scripts/bootstrap/modal.js'
- 'vendor/scripts/bootstrap/scrollspy.js'
- 'vendor/scripts/bootstrap/tab.js'
- 'vendor/scripts/bootstrap/tooltip.js'
+ 'bower_components/bootstrap/dist/bootstrap.js'
# CreateJS dependencies
'vendor/scripts/easeljs-NEXT.combined.js'
'vendor/scripts/preloadjs-NEXT.combined.js'
'vendor/scripts/soundjs-NEXT.combined.js'
'vendor/scripts/tweenjs-NEXT.combined.js'
'vendor/scripts/movieclip-NEXT.min.js'
+ # Validated Backbone Mediator dependencies
+ 'bower_components/tv4/tv4.js'
# Aether before box2d for some strange Object.defineProperty thing
'bower_components/aether/build/aether.js'
'bower_components/d3/d3.min.js'
+ 'vendor/scripts/async.js'
]
stylesheets:
defaultExtension: 'sass'
joinTo:
- 'stylesheets/app.css': /^(app|vendor)/
+ 'stylesheets/app.css': /^(app|vendor|bower_components)/
order:
- before: ['app/styles/bootstrap.scss']
+ before: [
+ 'app/styles/bootstrap.scss'
+ 'vendor/styles/nanoscroller.scss'
+ ]
templates:
defaultExtension: 'jade'
joinTo: 'javascripts/app.js'
diff --git a/headless_client.coffee b/headless_client.coffee
new file mode 100644
index 000000000..bdd7eeded
--- /dev/null
+++ b/headless_client.coffee
@@ -0,0 +1,217 @@
+###
+This file will simulate games on node.js by emulating the browser environment.
+###
+simulateOneGame = false
+if process.argv[2] is "one-game"
+ #calculate result of one game here
+ simulateOneGame = true
+ console.log "Simulating #{process.argv[3]} vs #{process.argv[4]}"
+bowerComponentsPath = "./bower_components/"
+headlessClientPath = "./headless_client/"
+
+# SETTINGS
+options =
+ workerCode: require headlessClientPath + 'worker_world'
+ debug: false # Enable logging of ajax calls mainly
+ testing: false # Instead of simulating 'real' games, use the same one over and over again. Good for leak hunting.
+ testFile: require headlessClientPath + 'test.js'
+ leakTest: false # Install callback that tries to find leaks automatically
+ exitOnLeak: false # Exit if leak is found. Only useful if leaktest is set to true, obviously.
+ heapdump: false # Dumps the whole heap after every pass. The heap dumps can then be viewed in Chrome browser.
+ headlessClient: true
+
+options.heapdump = require('heapdump') if options.heapdump
+server = if options.testing then "http://127.0.0.1:3000" else "http://codecombat.com"
+
+# Disabled modules
+disable = [
+ 'lib/AudioPlayer'
+ 'locale/locale'
+ '../locale/locale'
+]
+
+# Start of the actual code. Setting up the enivronment to match the environment of the browser
+
+# the path used for the loader. __dirname is module dependent.
+path = __dirname
+
+m = require 'module'
+request = require 'request'
+Deferred = require "JQDeferred"
+originalLoader = m._load
+
+unhook = () ->
+ m._load = originalLoader
+
+hook = () ->
+ m._load = hookedLoader
+
+
+JASON = require 'jason'
+
+# Global emulated stuff
+GLOBAL.window = GLOBAL
+GLOBAL.document = location: pathname: "headless_client"
+GLOBAL.console.debug = console.log
+
+GLOBAL.Worker = require('webworker-threads').Worker
+Worker::removeEventListener = (what) ->
+ if what is 'message'
+ @onmessage = -> #This webworker api has only one event listener at a time.
+
+GLOBAL.tv4 = require('tv4').tv4
+
+GLOBAL.marked = setOptions: ->
+
+store = {}
+GLOBAL.localStorage =
+ getItem: (key) => store[key]
+ setItem: (key, s) => store[key] = s
+ removeItem: (key) => delete store[key]
+
+# Hook node.js require. See https://github.com/mfncooper/mockery/blob/master/mockery.js
+# The signature of this function *must* match that of Node's Module._load,
+# since it will replace that.
+# (Why is there no easier way?)
+hookedLoader = (request, parent, isMain) ->
+ if request in disable or ~request.indexOf('templates')
+ console.log 'Ignored ' + request if options.debug
+ return class fake
+ else if '/' in request and not (request[0] is '.') or request is 'application'
+ request = path + '/app/' + request
+ else if request is 'underscore'
+ request = 'lodash'
+
+ console.log "loading " + request if options.debug
+ originalLoader request, parent, isMain
+
+
+#jQuery wrapped for compatibility purposes. Poorly.
+GLOBAL.$ = GLOBAL.jQuery = (input) ->
+ console.log 'Ignored jQuery: ' + input if options.debug
+ append: (input)-> exports: ()->
+
+cookies = request.jar()
+$.when = Deferred.when
+
+$.ajax = (options) ->
+ responded = false
+ url = options.url
+ if url.indexOf('http')
+ url = '/' + url unless url[0] is '/'
+ url = server + url
+
+ data = options.data
+
+
+ #if (typeof data) is 'object'
+ #console.warn JSON.stringify data
+ #data = JSON.stringify data
+
+ console.log "Requesting: " + JSON.stringify options if options.debug
+ console.log "URL: " + url if options.debug
+
+ deferred = Deferred()
+
+ request
+ url: url
+ jar: cookies
+ json: options.parse
+ method: options.type
+ body: data
+ , (error, response, body) ->
+ console.log "HTTP Request:" + JSON.stringify options if options.debug and not error
+
+ if responded
+ console.log "\t↳Already returned before." if options.debug
+ return
+
+ if (error)
+ console.warn "\t↳Returned: error: #{error}"
+ options.error(error) if options.error?
+ deferred.reject()
+
+ else
+ console.log "\t↳Returned: statusCode #{response.statusCode}: #{if options.parse then JSON.stringify body else body}" if options.debug
+ options.success(body, response, status: response.statusCode) if options.success?
+ deferred.resolve()
+
+ statusCode = response.statusCode if response?
+ options.complete(status: statusCode) if options.complete?
+ responded = true
+
+ deferred.promise()
+
+
+$.extend = (deep, into, from) ->
+ copy = _.clone(from, deep);
+ if into
+ _.assign into, copy
+ copy = into
+ copy
+
+$.isArray = (object) ->
+ _.isArray object
+
+$.isPlainObject = (object) ->
+ _.isPlainObject object
+
+
+do (setupLodash = this) ->
+ GLOBAL._ = require 'lodash'
+ _.str = require 'underscore.string'
+ _.string = _.str
+ _.mixin _.str.exports()
+
+
+# load Backbone. Needs hooked loader to reroute underscore to lodash.
+hook()
+GLOBAL.Backbone = require bowerComponentsPath + 'backbone/backbone'
+unhook()
+Backbone.$ = $
+
+require bowerComponentsPath + 'validated-backbone-mediator/backbone-mediator'
+# Instead of mediator, dummy might be faster yet suffice?
+#Mediator = class Mediator
+# publish: (id, object) ->
+# console.Log "Published #{id}: #{object}"
+# @subscribe: () ->
+# @unsubscribe: () ->
+
+GLOBAL.Aether = require 'aether'
+
+# Set up new loader.
+hook()
+
+login = require './login.coffee' #should contain an object containing they keys 'username' and 'password'
+
+#Login user and start the code.
+$.ajax
+ url: '/auth/login'
+ type: "POST"
+ data: login
+ parse: true
+ error: (error) -> "Bad Error. Can't connect to server or something. " + error
+ success: (response) ->
+ console.log "User: " + JSON.stringify response
+ GLOBAL.window.userObject = response # JSON.parse response
+
+ User = require 'models/User'
+
+ World = require 'lib/world/world'
+ LevelLoader = require 'lib/LevelLoader'
+ GoalManager = require 'lib/world/GoalManager'
+
+ SuperModel = require 'models/SuperModel'
+
+ log = require 'winston'
+
+ CocoClass = require 'lib/CocoClass'
+
+ Simulator = require 'lib/simulator/Simulator'
+
+ sim = new Simulator options
+ if simulateOneGame
+ sim.fetchAndSimulateOneGame(process.argv[3],process.argv[4])
+ else
+ sim.fetchAndSimulateTask()
diff --git a/headless_client/test.js b/headless_client/test.js
new file mode 100644
index 000000000..fdd51bf83
--- /dev/null
+++ b/headless_client/test.js
@@ -0,0 +1,87 @@
+module.exports = {
+ "messageGenerated": 1396792689279,
+ "sessions": [
+ {
+ "sessionID": "533a2c4893b95d9319a58049",
+ "submitDate": "2014-04-06T06:31:11.806Z",
+ "team": "humans",
+ "code": {
+ "ogre-base": {
+ "chooseAction": "// This is the code for your base. Decide which unit to build each frame.\n// Units you build will go into the this.built array.\n// Destroy the enemy base within 60 seconds!\n// Check out the Guide at the top for more info.\n\n// Choose your hero! You can only build one hero.\nvar hero;\n//hero = 'ironjaw'; // A leaping juggernaut hero, type 'brawler'.\nhero = 'yugargen'; // A devious spellcaster hero, type 'shaman'.\nif(hero && !this.builtHero) {\n this.builtHero = this.build(hero);\n return;\n}\n\n// Munchkins are weak melee units with 1.25s build cooldown.\n// Throwers are fragile, deadly ranged units with 2.5s build cooldown.\nvar buildOrder = ['munchkin', 'thrower', 'munchkin', 'thrower', 'munchkin', 'thrower'];\nvar type = buildOrder[this.built.length % buildOrder.length];\n//this.say('Unit #' + this.built.length + ' will be a ' + type);\nthis.build(type);\n//this.say(\"Move\", {to:{x:20, y:30}});{x: 68, y: 29}{x: 70, y: 30}"
+ },
+ "programmable-shaman": {
+ "chooseAction": "if (this.hero !== undefined) {\n this.hero = this.getNearest(enemy);\n}\n// Shamans are spellcasters with a weak magic attack\n// and three spells: 'shrink', 'grow', and 'poison-cloud'.\n// Shrink: target has 2/3 health, 1.5x speed for 5s.\n// Grow: target has double health, half speed for 5s.\n// Once per match, she can cast poison cloud, which does\n// 5 poison dps for 10s to enemies in a 10m radius.\nvar right = 0;\nif(right === 0){this.move({x: 70, y: 40});\n}\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\nif(this.canCast('shrink', enemy)) \n{\n this.castShrink(enemy);\n}\nelse\n{\n this.castGrow(friend);\n}\n\nvar enemiesinpoisonrange = 0;\nfor (var i = 0; i < enemies.lenght; ++i) {\n var enemi = enemies[i];\n if (this.distance(enemi) <= 10) {\n enemiesinpoisonrange++;\n }\n}\nif (enemiesinpoisonrange >= 7) {\n this.castPoisonCloud(enemy);\n}\n//if (this.distance(ogrebase) > 10) {\n// this.move({x: 70, y: 30});\n//}\n//this.say(\"Defend!\", {targetPos: {x: 45, y: 30}});\n\n//this.say(\"Defend!\", {targetPos: {x: 35, y: 30}});\n\n//this.say(\"Defend!\", {targetPos: {x: 25, y: 30}});\n\n//this.say(\"Attack!\", {to:{x:20, y:30}});\n\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(this.canCast('shrink', enemy)) this.castShrink(enemy);\n//if(this.canCast('grow', friend)) this.castGrow(friend);\n//if(this.canCast('poison-cloud', enemy)) this.castPoisonCloud(enemy);\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 45, y: 30}});\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 50, y: 40});"
+ },
+ "programmable-brawler": {
+ "chooseAction": "// The Brawler is a huge melee hero with mighty mass.\n// this.throw() hurls an enemy behind him.\n// this.jumpTo() leaps to a target within 20m every 10s.\n// this.stomp() knocks everyone away, once per match.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(!this.getCooldown('jump')) this.jumpTo(enemy.pos);\n//if(!this.getCooldown('stomp') && this.distance(enemy) < 10) this.stomp();\n//if(!this.getCooldown('throw')) this.throw(enemy);\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 60, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 50, y: 40});\n\n// You can store state on this across frames:\n//this.lastHealth = this.health;{x: 68, y: 29}{x: 70, y: 30}"
+ },
+ "programmable-librarian": {
+ "chooseAction": "var enemies = this.getEnemies();\nif (enemies.length === 0)\n return;\nvar enemy = this.getNearest(enemies);\nvar friends = this.getFriends();\nvar friend = this.getNearest(friends);\nvar archer = this.getFriends(type, \"archer\");\nvar soldier = this.getFriends(type, \"soldier\");\nvar hero = this.getFriends(type, \"hushbaum\");\nvar rand = Math.random();\nvar xmove;\nvar ymove;\nfor (var i = 0; i < enemies.length / 3; i += 1) {\n var e = enemies[i];\n var ehealth = Math.floor(e.health);\n if (this.canCast(\"haste\", friend)) {\n this.say(\"Godspeed \" + friend.id + \"!\");\n this.castHaste(friend);\n }\n if (this.canCast(\"haste\", this)) {\n this.say(\"I am Godspeed!\");\n this.castHaste(this);\n }\n if (this.canCast(\"slow\", e)) {\n this.say(\"Chill Out \" + e.id + \"!\");\n this.castSlow(e);\n }\n if (this.distance(e) < 45) {\n this.attack(e);\n this.say(\"Attacking \" + e.id + \" life is \" + ehealth + \".\");\n }\n if (this.health < this.maxHealth * 0.75) {\n if (this.pos.x > 20) {\n this.move({\n x: this.pos.x - 20,\n y: this.pos.y\n });\n } else {\n this.move({\n x: this.pos.x + 20,\n y: this.pos.y\n });\n }\n }\n if (this.canCast(\"regen\", this)) {\n this.castRegen(this);\n this.say(\"I won't die today bitch!\");\n }\n if (friend.health < friend.maxHealth * 0.5) {\n if (this.canCast(\"regen\", friend)) {\n this.say(\"You won't die today \" + friend.id + \".\");\n this.castRegen(friend);\n }\n }\n}\n;"
+ },
+ "programmable-tharin": {
+ "chooseAction": "// Tharin is a melee fighter with shield, warcry, and terrify skills.\n// this.shield() lets him take one-third damage while defending.\n// this.warcry() gives allies within 10m 30% haste for 5s, every 10s.\n// this.terrify() sends foes within 30m fleeing for 5s, once per match.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(!this.getCooldown('warcry')) this.warcry();\n//if(!this.getCooldown('terrify')) this.terrify();\n//this.shield();\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 30, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 40, y: 40});\n\n// You can store state on this across frames:\n//this.lastHealth = this.health;"
+ },
+ "human-base": {
+ "chooseAction": "// This is the code for your base. Decide which unit to build each frame.\n// Units you build will go into the this.built array.\n// Destroy the enemy base within 60 seconds!\n// Check out the Guide at the top for more info.\n\n// CHOOSE YOUR HERO! You can only build one hero.\nvar hero;\n//hero = 'tharin'; // A fierce knight with battlecry abilities.\nhero = 'hushbaum'; // A fiery spellcaster hero.\n\nif(hero && !this.builtHero) {\n this.builtHero = this.build(hero);\n return;\n}\n\n// Soldiers are hard-to-kill, low damage melee units with 2s build cooldown.\n// Archers are fragile but deadly ranged units with 2.5s build cooldown.\nvar buildOrder = ['soldier', 'soldier', 'archer', 'archer', 'soldier', 'soldier'];\nvar type = buildOrder[this.built.length % buildOrder.length];\nthis.say('Unit #' + this.built.length + ' will be a ' + type);\nthis.build(type);\n\n "
+ }
+ },
+ "teamSpells": {
+ "ogres": [
+ "programmable-brawler/chooseAction",
+ "programmable-shaman/chooseAction",
+ "ogre-base/chooseAction"
+ ],
+ "humans": [
+ "programmable-librarian/chooseAction",
+ "programmable-tharin/chooseAction",
+ "human-base/chooseAction"
+ ]
+ },
+ "levelID": "dungeon-arena",
+ "creator": "5338c38c4811eff221de2347",
+ "creatorName": "iC0DE"
+ },
+ {
+ "sessionID": "532a777c2042708b711a6c29",
+ "submitDate": "2014-03-20T05:45:54.691Z",
+ "team": "ogres",
+ "code": {
+ "ogre-base": {
+ "chooseAction": "// This is the code for your base. Decide which unit to build each frame.\n// Units you build will go into the this.built array.\n// Destroy the enemy base within 60 seconds!\n// Check out the Guide at the top for more info.\n\n// Choose your hero! You can only build one hero.\nvar hero;\n//hero = 'ironjaw'; // A leaping juggernaut hero, type 'brawler'.\nhero = 'yugargen'; // A devious spellcaster hero, type 'shaman'.\nif(hero && !this.builtHero) {\n this.builtHero = this.build(hero);\n return;\n}\n\n// Munchkins are weak melee units with 1.25s build cooldown.\n// Throwers are fragile, deadly ranged units with 2.5s build cooldown.\nvar buildOrder = ['munchkin', 'munchkin', 'munchkin', 'thrower'];\nvar type = buildOrder[this.built.length % buildOrder.length];\n//this.say('Unit #' + this.built.length + ' will be a ' + type);\nthis.build(type);"
+ },
+ "programmable-shaman": {
+ "chooseAction": "// Shamans are spellcasters with a weak magic attack\n// and three spells: 'shrink', 'grow', and 'poison-cloud'.\n// Shrink: target has 2/3 health, 1.5x speed for 5s.\n// Grow: target has double health, half speed for 5s.\n// Once per match, she can cast poison cloud, which does\n// 5 poison dps for 10s to enemies in a 10m radius.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) {\n return; // Chill if all enemies are dead.\n}\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\nif (enemies.length > 5) {\n if(this.canCast('poison-cloud', enemy)) {\n this.castPoisonCloud(enemy);\n return;\n }\n}\n\nif (friends.length > 4) {\n this.attack(enemy); \n}\nfor (var i = 0; i < friends.length; ++i) {\n if (friends[i].health < 0) {\n continue;\n }\n if(friends[i].type == \"thrower\" && this.canCast('shrink', friends[i])) {\n this.castShrink(friends[i]);\n return;\n } \n if(friends[i].type == \"munchkin\" && this.canCast('grow', friends[i])) {\n this.castGrow(friends[i]);\n return;\n } \n}\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(this.canCast('shrink', enemy)) this.castShrink(enemy);\n//if(this.canCast('grow', friend)) this.castGrow(friend);\n//if(this.canCast('poison-cloud', enemy)) this.castPoisonCloud(enemy);\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 60, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 50, y: 40});"
+ },
+ "programmable-brawler": {
+ "chooseAction": "// The Brawler is a huge melee hero with mighty mass.\n// this.throw() hurls an enemy behind him.\n// this.jumpTo() leaps to a target within 20m every 10s.\n// this.stomp() knocks everyone away, once per match.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(!this.getCooldown('jump')) this.jumpTo(enemy.pos);\n//if(!this.getCooldown('stomp') && this.distance(enemy) < 10) this.stomp();\n//if(!this.getCooldown('throw')) this.throw(enemy);\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 60, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 50, y: 40});\n\n// You can store state on this across frames:\n//this.lastHealth = this.health;"
+ },
+ "human-base": {
+ "chooseAction": "// This is the code for your base. Decide which unit to build each frame.\n// Units you build will go into the this.built array.\n// Destroy the enemy base within 60 seconds!\n// Check out the Guide at the top for more info.\n\n// CHOOSE YOUR HERO! You can only build one hero.\nvar hero;\nhero = 'tharin'; // A fierce knight with battlecry abilities.\n//hero = 'hushbaum'; // A fiery spellcaster hero.\n\nif(hero && !this.builtHero) {\n this.builtHero = this.build(hero);\n return;\n}\n\n// Soldiers are hard-to-kill, low damage melee units with 2s build cooldown.\n// Archers are fragile but deadly ranged units with 2.5s build cooldown.\nvar buildOrder = ['archer', 'archer', 'soldier', 'archer', 'soldier'];\nvar type = buildOrder[this.built.length % buildOrder.length];\n//this.say('Unit #' + this.built.length + ' will be a ' + type);\nthis.build(type);"
+ },
+ "programmable-tharin": {
+ "chooseAction": "this.findTypeInRange = function(units, type) {\n for (var i = 0; i < units.length; ++i) {\n var unit = units[i];\n if (unit.type === type && this.distance(unit) < 20)\n return unit;\n }\n return null;\n};\n\nthis.findType = function(units, type) {\n for (var i = 0; i < units.length; ++i) {\n var unit = units[i];\n if (unit.type === type)\n return unit;\n }\n return null;\n};\n\nthis.findHeroInRange = function(units, range) {\n for (var i = 0; i < units.length; ++i) {\n var unit = units[i];\n if ((unit.type === 'shaman' || unit.type === 'brawler') && this.distance(unit) < range)\n return unit;\n }\n return null;\n};\n\n// Tharin is a melee fighter with shield, warcry, and terrify skills.\n// this.shield() lets him take one-third damage while defending.\n// this.warcry() gives allies within 10m 30% haste for 5s, every 10s.\n// this.terrify() sends foes within 30m fleeing for 5s, once per match.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\n\n//Enemies\nvar enemyBase = this.findType(enemies, 'base');\nvar brawler = this.findTypeInRange(enemies, 'brawler');\nvar shaman = this.findTypeInRange(enemies, 'shaman');\n\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(!this.getCooldown('warcry')) this.warcry();\n//if(!this.getCooldown('terrify')) this.terrify();\n//this.shield();\n\nif((brawler || shaman) && !this.attackTime)\n{\n this.attackTime = true;\n if(brawler)\n this.say(\"Attack!\", {target: brawler});\n else if(shaman)\n this.say(\"Attack!\", {target: shaman});\n}\nelse if(this.health < 15 && this.getCooldown('terrify'))\n{\n this.terrify();\n}\nelse if(this.findHeroInRange(enemies, 30) && this.getCooldown('terrify'))\n{\n this.terrify();\n}\nelse if(this.health < 25)\n{\n this.shield();\n}\nelse if(brawler && this.distance(brawler) <=10)\n{\n this.attack(brawler);\n}\nelse\n{\n this.attack(enemy);\n}\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 30, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 40, y: 40});\n\n// You can store state on this across frames:\n//this.lastHealth = this.health;"
+ },
+ "programmable-librarian": {
+ "chooseAction": "// The Librarian is a spellcaster with a fireball attack\n// plus three useful spells: 'slow', 'regen', and 'haste'.\n// Slow makes a target move and attack at half speed for 5s.\n// Regen makes a target heal 10 hp/s for 10s.\n// Haste speeds up a target by 4x for 5s, once per match.\n\nvar friends = this.getFriends();\nvar enemies = this.getEnemies();\nif (enemies.length === 0) return; // Chill if all enemies are dead.\nvar enemy = this.getNearest(enemies);\nvar friend = this.getNearest(friends);\n\n// Which one do you do at any given time? Only the last called action happens.\n//if(this.canCast('slow', enemy)) this.castSlow(enemy);\n//if(this.canCast('regen', friend)) this.castRegen(friend);\n//if(this.canCast('haste', friend)) this.castHaste(friend);\n//this.attack(enemy);\n\n// You can also command your troops with this.say():\n//this.say(\"Defend!\", {targetPos: {x: 30, y: 30}}));\n//this.say(\"Attack!\", {target: enemy});\n//this.say(\"Move!\", {targetPos: {x: 50, y: 40});"
+ }
+ },
+ "teamSpells": {
+ "ogres": [
+ "programmable-brawler/chooseAction",
+ "programmable-shaman/chooseAction",
+ "ogre-base/chooseAction"
+ ],
+ "humans": [
+ "programmable-librarian/chooseAction",
+ "programmable-tharin/chooseAction",
+ "human-base/chooseAction"
+ ]
+ },
+ "levelID": "dungeon-arena",
+ "creator": "53291a80b112e7240f324667",
+ "creatorName": "Imbal Oceanrage"
+ }
+],
+ "taskID": "53415d71942d00aa43dbf3e9",
+ "receiptHandle": "cd50e44db7dbd4cc0bcce047aa822ba2fe3556cf"
+}
\ No newline at end of file
diff --git a/headless_client/worker_world.coffee b/headless_client/worker_world.coffee
new file mode 100644
index 000000000..e40317bfe
--- /dev/null
+++ b/headless_client/worker_world.coffee
@@ -0,0 +1,220 @@
+# function to use inside a webworker.
+# This function needs to run inside an environment that has a 'self'.
+# This specific worker is targeted towards the node.js headless_client environment.
+
+JASON = require 'jason'
+fs = require 'fs'
+GLOBAL.Aether = Aether = require 'aether'
+GLOBAL._ = _ = require 'lodash'
+
+betterConsole = () ->
+
+ self.logLimit = 200;
+ self.logsLogged = 0;
+
+ self.transferableSupported = () -> true
+
+ self.console = log: ->
+ if self.logsLogged++ is self.logLimit
+ self.postMessage
+ type: "console-log"
+ args: ["Log limit " + self.logLimit + " reached; shutting up."]
+ id: self.workerID
+
+ else if self.logsLogged < self.logLimit
+ args = [].slice.call(arguments)
+ i = 0
+
+ while i < args.length
+ args[i] = args[i].toString() if args[i].constructor.className is "Thang" or args[i].isComponent if args[i] and args[i].constructor
+ ++i
+ try
+ self.postMessage
+ type: "console-log"
+ args: args
+ id: self.workerID
+
+ catch error
+ self.postMessage
+ type: "console-log"
+ args: [
+ "Could not post log: " + args
+ error.toString()
+ error.stack
+ error.stackTrace
+ ]
+ id: self.workerID
+
+ # so that we don't crash when debugging statements happen
+ self.console.error = self.console.warn = self.console.info = self.console.debug = self.console.log
+ GLOBAL.console = console = self.console
+ self.console
+
+
+work = () ->
+ console.log "starting..."
+
+ console.log = ->
+
+ World = self.require('lib/world/world')
+ GoalManager = self.require('lib/world/GoalManager')
+
+ Aether.addGlobal('Vector', require('lib/world/vector'))
+ Aether.addGlobal('_', _)
+
+ self.cleanUp = ->
+ self.world = null
+ self.goalManager = null
+ self.postedErrors = {}
+ self.t0 = null
+ self.logsLogged = 0
+
+ self.runWorld = (args) ->
+ console.log "Running world inside worker."
+ self.postedErrors = {}
+ self.t0 = new Date()
+ self.postedErrors = false
+ self.logsLogged = 0
+
+ try
+ self.world = new World(args.userCodeMap)
+ self.world.levelSessionIDs = args.levelSessionIDs
+ self.world.loadFromLevel args.level, true if args.level
+ self.world.headless = args.headless
+ self.goalManager = new GoalManager(self.world)
+ self.goalManager.setGoals args.goals
+ self.goalManager.setCode args.userCodeMap
+ self.goalManager.worldGenerationWillBegin()
+ self.world.setGoalManager self.goalManager
+ catch error
+ console.log "There has been an error inside the worker."
+ self.onWorldError error
+ return
+ Math.random = self.world.rand.randf # so user code is predictable
+ console.log "Loading frames."
+
+ self.postMessage type: "start-load-frames"
+
+
+ self.world.loadFrames self.onWorldLoaded, self.onWorldError, self.onWorldLoadProgress, true
+
+
+ self.onWorldLoaded = onWorldLoaded = ->
+ self.goalManager.worldGenerationEnded()
+ goalStates = self.goalManager.getGoalStates()
+ self.postMessage type: "end-load-frames", goalStates: goalStates
+
+ t1 = new Date()
+ diff = t1 - self.t0
+ if (self.world.headless)
+ return console.log("Headless simulation completed in #{diff}ms.");
+
+ transferableSupported = self.transferableSupported()
+ try
+ serialized = serializedWorld: self.world.serialize()
+ transferableSupported = false
+ catch error
+ console.log "World serialization error:", error.toString() + "\n" + error.stack or error.stackTrace
+ t2 = new Date()
+
+ # console.log("About to transfer", serialized.serializedWorld.trackedPropertiesPerThangValues, serialized.transferableObjects);
+ try
+ message =
+ type: "new-world"
+ serialized: serialized.serializedWorld
+ goalStates: goalStates
+ if transferableSupported
+ self.postMessage message, serialized.transferableObjects
+ else
+ self.postMessage message
+
+ catch error
+ console.log "World delivery error:", error.toString() + "\n" + error.stack or error.stackTrace
+ t3 = new Date()
+ console.log "And it was so: (" + (diff / self.world.totalFrames).toFixed(3) + "ms per frame,", self.world.totalFrames, "frames)\nSimulation :", diff + "ms \nSerialization:", (t2 - t1) + "ms\nDelivery :", (t3 - t2) + "ms"
+ self.cleanUp()
+
+
+ self.onWorldError = onWorldError = (error) ->
+ self.postMessage type: "end-load-frames"
+ if error instanceof Aether.problems.UserCodeProblem
+ #console.log "Aether userCodeProblem occured."
+ unless self.postedErrors[error.key]
+ problem = error.serialize()
+ self.postMessage
+ type: "user-code-problem"
+ problem: problem
+
+ self.postedErrors[error.key] = problem
+ else
+ console.log "Non-UserCodeError:", error.toString() + "\n" + error.stack or error.stackTrace
+ self.cleanUp()
+
+ self.onWorldLoadProgress = onWorldLoadProgress = (progress) ->
+ #console.log "Worker onWorldLoadProgress"
+ self.postMessage
+ type: "world-load-progress-changed"
+ progress: progress
+
+ self.abort = abort = ->
+ #console.log "Abort called for worker."
+ if self.world
+ #console.log "About to abort:", self.world.name, typeof self.world.abort
+ self.world.abort()
+ self.world = null
+ self.postMessage type: "abort"
+ self.cleanUp()
+
+ self.reportIn = reportIn = ->
+ console.log "Reporting in."
+ self.postMessage type: "report-in"
+
+ self.addEventListener "message", (event) ->
+ #console.log JSON.stringify event
+ self[event.data.func] event.data.args
+
+ self.postMessage type: "worker-initialized"
+
+worldCode = fs.readFileSync "./public/javascripts/world.js", 'utf8'
+lodashCode = fs.readFileSync "./public/javascripts/lodash.js", 'utf8'
+aetherCode = fs.readFileSync "./public/javascripts/aether.js", 'utf8'
+
+#window.BOX2D_ENABLED = true;
+
+newConsole = "newConsole = #{}JASON.stringify newConsole}()";
+
+ret = """
+
+ GLOBAL = root = window = self;
+ GLOBAL.window = window;
+
+ self.workerID = "Worker";
+
+ console = #{JASON.stringify betterConsole}();
+
+ try {
+ // the world javascript file
+ #{worldCode};
+ #{lodashCode};
+ #{aetherCode};
+
+ // Don't let user generated code access stuff from our file system!
+ self.importScripts = importScripts = null;
+ self.native_fs_ = native_fs_ = null;
+
+ // the actual function
+ #{JASON.stringify work}();
+ }catch (error) {
+ self.postMessage({"type": "console-log", args: ["An unhandled error occured: ", error.toString(), error.stack], id: -1});
+ }
+"""
+
+
+#console = #{JASON.stringify createConsole}();
+#
+# console.error = console.info = console.log;
+#self.console = console;
+#GLOBAL.console = console;
+
+
+module.exports = new Function(ret)
diff --git a/package.json b/package.json
index 665ac0131..3986248e1 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,8 @@
"mongoose": "3.8.x",
"mongoose-text-search": "~0.0.2",
"request": "2.12.x",
- "tv4": "1.0.11",
- "lodash": "~2.0.0",
+ "tv4": "~1.0.16",
+ "lodash": "~2.4.1",
"underscore.string": "2.3.x",
"async": "0.2.x",
"connect": "2.7.x",
@@ -60,9 +60,14 @@
"gridfs-stream": "0.4.x",
"stream-buffers": "0.2.x",
"sendwithus": "2.0.x",
- "aws-sdk":"~2.0.0",
- "bayesian-battle":"0.0.x",
- "redis": ""
+ "aws-sdk": "~2.0.0",
+ "bayesian-battle": "0.0.x",
+ "redis": "",
+ "webworker-threads": "~0.4.11",
+ "node-gyp": "~0.13.0",
+ "aether": "~0.2.8",
+ "JASON": "~0.1.3",
+ "JQDeferred": "~2.1.0"
},
"devDependencies": {
"jade": "0.33.x",
@@ -73,7 +78,6 @@
"css-brunch": "> 1.0 < 1.8",
"jade-brunch": "> 1.0 < 1.8",
"uglify-js-brunch": "~1.7.4",
- "clean-css-brunch": "> 1.0 < 1.8",
"auto-reload-brunch": "> 1.0 < 1.8",
"brunch": "~1.7.4",
"jasmine-node": "1.13.x",
@@ -92,7 +96,9 @@
"karma-requirejs": "~0.2.1",
"karma-phantomjs-launcher": "~0.1.1",
"karma": "~0.10.9",
- "karma-coverage": "~0.1.4"
+ "karma-coverage": "~0.1.4",
+ "compressible": "~1.0.1",
+ "jasmine-spec-reporter": "~0.3.0"
},
"license": "MIT for the code, and CC-BY for the art and music",
"private": true,
diff --git a/scripts/devSetup/directoryController.py b/scripts/devSetup/directoryController.py
index 6585ff5f8..5087db888 100644
--- a/scripts/devSetup/directoryController.py
+++ b/scripts/devSetup/directoryController.py
@@ -20,23 +20,30 @@ class DirectoryController(object):
def bin_directory(self):
return self.root_install_directory
+ def mkdir(self, path):
+ if os.path.exists(path):
+ print(u"Skipping creation of " + path + " because it exists.")
+ else:
+ os.mkdir(path)
+
def create_directory_in_tmp(self,subdirectory):
- os.mkdir(self.generate_path_for_directory_in_tmp(subdirectory))
+ path = self.generate_path_for_directory_in_tmp(subdirectory)
+ self.mkdir(path)
def generate_path_for_directory_in_tmp(self,subdirectory):
return self.tmp_directory + os.sep + subdirectory
def create_directory_in_bin(self,subdirectory):
full_path = self.bin_directory + os.sep + subdirectory
- os.mkdir(full_path)
+ self.mkdir(full_path)
def create_base_directories(self):
shutil.rmtree(self.root_dir + os.sep + "coco" + os.sep + "node_modules",ignore_errors=True) #just in case
try:
- if os.path.exists(self.tmp_directory):
- self.remove_tmp_directory()
- os.mkdir(self.tmp_directory)
+ if os.path.exists(self.tmp_directory):
+ self.remove_tmp_directory()
+ os.mkdir(self.tmp_directory)
except:
- raise errors.CoCoError(u"There was an error creating the directory structure, do you have correct permissions? Please remove all and start over.")
+ raise errors.CoCoError(u"There was an error creating the directory structure, do you have correct permissions? Please remove all and start over.")
def remove_directories(self):
shutil.rmtree(self.bin_directory + os.sep + "node",ignore_errors=True)
diff --git a/scripts/devSetup/factories.py b/scripts/devSetup/factories.py
index f14f922ec..1eab847bb 100644
--- a/scripts/devSetup/factories.py
+++ b/scripts/devSetup/factories.py
@@ -37,10 +37,12 @@ class SetupFactory(object):
try:
mongo_version_string = subprocess.check_output("mongod --version",shell=True)
mongo_version_string = mongo_version_string.decode(encoding='UTF-8')
- except:
- print("Mongod not found.")
+ except Exception as e:
+ print("Mongod not found: %s"%e)
if "v2.6." not in mongo_version_string:
- print("MongoDB not found, so installing...")
+ if mongo_version_string:
+ print("Had MongoDB version: %s"%mongo_version_string)
+ print("MongoDB not found, so installing a local copy...")
self.mongo.download_dependencies()
self.mongo.install_dependencies()
self.node.download_dependencies()
diff --git a/scripts/devSetup/mongo.py b/scripts/devSetup/mongo.py
index 88de736af..eb57ea452 100644
--- a/scripts/devSetup/mongo.py
+++ b/scripts/devSetup/mongo.py
@@ -8,7 +8,7 @@ import os
from configuration import Configuration
from dependency import Dependency
import sys
-
+import shutil
class MongoDB(Dependency):
def __init__(self,configuration):
@@ -32,13 +32,20 @@ class MongoDB(Dependency):
def bashrc_string(self):
return "COCO_MONGOD_PATH=" + self.config.directory.bin_directory + os.sep + u"mongo" + os.sep +"bin" + os.sep + "mongod"
+
def download_dependencies(self):
- self.downloader.download()
- self.downloader.decompress()
+ install_directory = self.config.directory.bin_directory + os.sep + u"mongo"
+ if os.path.exists(install_directory):
+ print(u"Skipping MongoDB download because " + install_directory + " exists.")
+ else:
+ self.downloader.download()
+ self.downloader.decompress()
def install_dependencies(self):
install_directory = self.config.directory.bin_directory + os.sep + u"mongo"
- import shutil
- shutil.copytree(self.findUnzippedMongoBinPath(),install_directory)
+ if os.path.exists(install_directory):
+ print(u"Skipping creation of " + install_directory + " because it exists.")
+ else:
+ shutil.copytree(self.findUnzippedMongoBinPath(),install_directory)
def findUnzippedMongoBinPath(self):
return self.downloader.download_directory + os.sep + \
diff --git a/scripts/devSetup/node.py b/scripts/devSetup/node.py
index 065634aad..8fb1265d8 100644
--- a/scripts/devSetup/node.py
+++ b/scripts/devSetup/node.py
@@ -37,19 +37,27 @@ class Node(Dependency):
return self.config.directory.bin_directory
def download_dependencies(self):
- self.downloader.download()
- self.downloader.decompress()
+ install_directory = self.config.directory.bin_directory + os.sep + u"node"
+ if os.path.exists(install_directory):
+ print(u"Skipping Node download because " + install_directory + " exists.")
+ else:
+ self.downloader.download()
+ self.downloader.decompress()
def bashrc_string(self):
return "COCO_NODE_PATH=" + self.config.directory.bin_directory + os.sep + u"node" + os.sep + "bin" + os.sep +"node"
def install_dependencies(self):
install_directory = self.config.directory.bin_directory + os.sep + u"node"
#check for node here
- unzipped_node_path = self.findUnzippedNodePath()
if self.config.system.operating_system in ["mac","linux"] and not which("node"):
+ unzipped_node_path = self.findUnzippedNodePath()
print("Copying node into /usr/local/bin/...")
shutil.copy(unzipped_node_path + os.sep + "bin" + os.sep + "node","/usr/local/bin/")
os.chmod("/usr/local/bin/node",S_IRWXG|S_IRWXO|S_IRWXU)
- shutil.copytree(self.findUnzippedNodePath(),install_directory)
+ if os.path.exists(install_directory):
+ print(u"Skipping creation of " + install_directory + " because it exists.")
+ else:
+ unzipped_node_path = self.findUnzippedNodePath()
+ shutil.copytree(self.findUnzippedNodePath(),install_directory)
wants_to_upgrade = True
if self.check_if_executable_installed(u"npm"):
warning_string = u"A previous version of npm has been found. \nYou may experience problems if you have a version of npm that's too old.Would you like to upgrade?(y/n) "
diff --git a/scripts/mail.coffee b/scripts/mail.coffee
new file mode 100644
index 000000000..b9983b619
--- /dev/null
+++ b/scripts/mail.coffee
@@ -0,0 +1,104 @@
+do (setupLodash = this) ->
+ GLOBAL._ = require 'lodash'
+ _.str = require 'underscore.string'
+ _.mixin _.str.exports()
+
+async = require 'async'
+
+serverSetup = require '../server_setup'
+sendwithus = require '../server/sendwithus'
+User = require '../server/users/User.coffee'
+Level = require '../server/levels/Level.coffee'
+LevelSession = require '../server/levels/sessions/LevelSession.coffee'
+
+alreadyEmailed = []
+
+DEBUGGING = true
+
+sendInitialRecruitingEmail = ->
+ leaderboards = [
+ {slug: 'brawlwood', team: 'humans', limit: 55, name: "Brawlwood", original: "52d97ecd32362bc86e004e87", majorVersion: 0}
+ {slug: 'brawlwood', team: 'ogres', limit: 40, name: "Brawlwood", original: "52d97ecd32362bc86e004e87", majorVersion: 0}
+ {slug: 'dungeon-arena', team: 'humans', limit: 200, name: "Dungeon Arena", original: "53173f76c269d400000543c2", majorVersion: 0}
+ {slug: 'dungeon-arena', team: 'ogres', limit: 150, name: "Dungeon Arena", original: "53173f76c269d400000543c2", majorVersion: 0}
+ ]
+ async.waterfall [
+ (callback) -> async.map leaderboards, grabSessions, callback
+ (sessionLists, callback) -> async.map collapseSessions(sessionLists), grabUser, callback
+ (users, callback) -> async.map users, emailUser, callback
+ ], (err, results) ->
+ return console.log "Error:", err if err
+ console.log "Looked at sending to #{results.length} users; sent to #{_.filter(results).length}."
+ console.log "Sent to: ['#{(user.email for user in results when user).join('\', \'')}']"
+
+grabSessions = (levelInfo, callback) ->
+ queryParameters =
+ level: {original: levelInfo.original, majorVersion: levelInfo.majorVersion}
+ team: levelInfo.team
+ submitted: true
+ sortParameters = totalScore: -1
+ selectString = 'totalScore creator'
+ query = LevelSession
+ .find(queryParameters)
+ .limit(levelInfo.limit)
+ .sort(sortParameters)
+ .select(selectString)
+ .lean()
+ query.exec (err, sessions) ->
+ return callback err if err
+ for session, rank in sessions
+ session.levelInfo = levelInfo
+ session.rank = rank + 1
+ callback null, sessions
+
+collapseSessions = (sessionLists) ->
+ userRanks = {}
+ for sessionList in sessionLists
+ for session in sessionList
+ ranks = userRanks[session.creator] ? []
+ ranks.push session
+ userRanks[session.creator] = _.sortBy ranks, 'rank'
+ topSessions = []
+ for userID, ranks of userRanks
+ topSessions.push ranks[0]
+ topSessions
+
+grabUser = (session, callback) ->
+ findParameters = _id: session.creator
+ selectString = 'email emailSubscriptions emails name jobProfile'
+ query = User
+ .findOne(findParameters)
+ .select(selectString)
+ .lean()
+ query.exec (err, user) ->
+ return callback err if err
+ user.session = session
+ callback null, user
+
+totalEmailsSent = 0
+emailUser = (user, callback) ->
+ #return callback null, false if user.emails?.anyNotes?.enabled is false # TODO: later, uncomment to obey also "anyNotes" when that's untangled
+ return callback null, false if user.emails?.recruitNotes?.enabled is false
+ return callback null, false if user.email in alreadyEmailed
+ return callback null, false if DEBUGGING and (totalEmailsSent > 1 or Math.random() > 0.1)
+ ++totalEmailsSent
+ name = if user.firstName and user.lastName then "#{user.firstName}" else user.name
+ name = "Wizard" if not name or name is "Anoner"
+ team = user.session.levelInfo.team
+ team = team.substr(0, team.length - 1)
+ context =
+ email_id: sendwithus.templates.one_time_recruiting_email
+ recipient:
+ address: if DEBUGGING then 'nick@codecombat.com' else user.email
+ name: name
+ email_data:
+ name: name
+ level_name: user.session.levelInfo.name
+ place: "##{user.session.rank}" # like "#31"
+ level_race: team
+ sendwithus.api.send context, (err, result) ->
+ return callback err if err
+ callback null, user
+
+serverSetup.connectToDatabase()
+sendInitialRecruitingEmail()
diff --git a/scripts/mongodb/migrations/2014-04-22-migrate-emails.js b/scripts/mongodb/migrations/2014-04-22-migrate-emails.js
new file mode 100644
index 000000000..07ccd32ad
--- /dev/null
+++ b/scripts/mongodb/migrations/2014-04-22-migrate-emails.js
@@ -0,0 +1,35 @@
+// Did not migrate anonymous users because they get their properties setup on signup.
+
+// migrate the most common subscription configs with mass update commands
+db.users.update({anonymous:false, emailSubscriptions:['announcement', 'notification'], emails:{$exists:false}}, {$set:{emails:{}}}, {multi:true});
+db.users.update({anonymous:false, emailSubscriptions:[], emails:{$exists:false}}, {$set:{emails:{anyNotes:{enabled:false}, generalNews:{enabled:false}}}}, {multi:true});
+
+// migrate the rest one by one
+emailMap = {
+ announcement: 'generalNews',
+ developer: 'archmageNews',
+ tester: 'adventurerNews',
+ level_creator: 'artisanNews',
+ article_editor: 'scribeNews',
+ translator: 'diplomatNews',
+ support: 'ambassadorNews',
+ notification: 'anyNotes'
+};
+
+db.users.find({anonymous:false, emails:{$exists:false}}).forEach(function(u) {
+ emails = {anyNotes:{enabled:false}, generalNews:{enabled:false}};
+ var oldEmailSubs = u.emailSubscriptions || ['notification', 'announcement'];
+ for(var email in oldEmailSubs) {
+ var oldEmailName = oldEmailSubs[email];
+ var newEmailName = emailMap[oldEmailName];
+ if(!newEmailName) {
+ print('STOP, COULD NOT FIND EMAIL NAME', oldEmailName);
+ return false;
+ }
+ emails[newEmailName] = {enabled:true};
+ }
+ u.emails = emails;
+ db.users.save(u);
+});
+
+// Done. No STOP error when this was run.
\ No newline at end of file
diff --git a/scripts/mongodb/migrations/2014-05-08-populate-watchers.js b/scripts/mongodb/migrations/2014-05-08-populate-watchers.js
new file mode 100644
index 000000000..b6a56b475
--- /dev/null
+++ b/scripts/mongodb/migrations/2014-05-08-populate-watchers.js
@@ -0,0 +1,70 @@
+var scott = ObjectId('5162fab9c92b4c751e000274');
+var nick = ObjectId('512ef4805a67a8c507000001');
+//var collections = [db.levels, db.level.components, db.level.systems];
+var collection = db.levels;
+//var collection = db.level.components;
+//var collection = db.level.systems;
+var permission;
+
+collection.find({slug:{$exists:1}}).forEach(function(doc) {
+ print('--------------------------------------------------', doc.name);
+ var official = false;
+ var owner = null;
+ var changed = false;
+ for (var j in doc.permissions) {
+ permission = doc.permissions[j];
+ if(permission.access !== 'owner')
+ continue;
+ owner = permission.target;
+ if(owner === scott+'') {
+ print('Owner of', doc.name, 'is Scott');
+ official = true;
+ }
+ else if(owner === nick+'') {
+ print('Owner of', doc.name, 'is Nick');
+ official = true;
+ }
+ else {
+ print('Owner of', doc.name, 'is', owner);
+ }
+ }
+ if(!doc.watchers) {
+ print('Init watchers, was', doc.watchers);
+ doc.watchers = [];
+ }
+ if(official) {
+ var hasNick = false;
+ var hasScott = false;
+ for(var k in doc.watchers) {
+ var watcher = doc.watchers[k];
+ if(watcher.equals(nick)) hasNick = true;
+ if(watcher.equals(scott)) hasScott = true;
+ }
+ if(!hasNick) {
+ doc.watchers.push(nick);
+ print('Added Nick to', doc.name);
+ changed = true;
+ }
+ if(!hasScott) {
+ doc.watchers.push(scott);
+ print('Added Scott to', doc.name);
+ changed = true;
+ }
+ }
+ else {
+ var hasOwner = false;
+ for(var l in doc.watchers) {
+ var watcher = doc.watchers[l];
+ if(watcher+'' === owner) hasOwner = true;
+ }
+ if(!hasOwner) {
+ doc.watchers.push(ObjectId(owner));
+ print('Added owner to', doc.name);
+ changed = true;
+ }
+ }
+ if(changed) {
+ print('Changed, so saving');
+ collection.save(doc);
+ }
+});
\ No newline at end of file
diff --git a/scripts/mongodb/queries/patches.js b/scripts/mongodb/queries/patches.js
new file mode 100644
index 000000000..418ebbe18
--- /dev/null
+++ b/scripts/mongodb/queries/patches.js
@@ -0,0 +1,13 @@
+// Finds all patches and denorms their target names and creators.
+
+var patches = db.patches.find({status:'pending'}).toArray();
+for(var i in patches) {
+ var patch = patches[i];
+ var collection = null;
+ if(patch.target.collection === 'level') collection = db.levels;
+ if(patch.target.collection === 'level_component') collection = db.level.components;
+ if(patch.target.collection === 'level_system') collection = db.level.systems;
+ var target = collection.findOne({original:patch.target.original, name:{$exists:true}});
+ var creator = db.users.findOne({_id:patch.creator});
+ print(target.name, 'made by', creator.name);
+ }
\ No newline at end of file
diff --git a/scripts/simulate.coffee b/scripts/simulate.coffee
new file mode 100644
index 000000000..01eccb5f9
--- /dev/null
+++ b/scripts/simulate.coffee
@@ -0,0 +1,23 @@
+spawn = require("child_process").spawn
+
+[sessionOne, sessionTwo] = [process.argv[2],process.argv[3]]
+homeDirectory = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE
+unless sessionOne and sessionTwo and sessionOne.length is 24 and sessionTwo.length is 24
+ console.log "Not enough games to continue!"
+ process.exit(1)
+run = (cb) ->
+ command = spawn("coffee",["headless_client.coffee","one-game",sessionOne,sessionTwo],{cwd: homeDirectory + "/codecombat/"})
+ result = ""
+ command.stdout.on 'data', (data) ->
+ result += data.toString()
+ command.stdout.on 'close', ->
+ return cb(result)
+run (result) ->
+ lines = result.split("\n")
+ for line in lines
+ if line.slice(0, 10) is "GAMERESULT"
+ process.stdout.write line.slice(11)
+ process.exit(0)
+ process.exit(0)
+
+
\ No newline at end of file
diff --git a/scripts/transpile.coffee b/scripts/transpile.coffee
new file mode 100644
index 000000000..0cb4b462f
--- /dev/null
+++ b/scripts/transpile.coffee
@@ -0,0 +1,81 @@
+do (setupLodash = this) ->
+ GLOBAL._ = require 'lodash'
+ _.str = require 'underscore.string'
+ _.mixin _.str.exports()
+Aether = require "aether"
+async = require 'async'
+
+serverSetup = require '../server_setup'
+Level = require '../server/levels/Level.coffee'
+LevelSession = require '../server/levels/sessions/LevelSession.coffee'
+
+Aether.addGlobal 'Vector', require '../app/lib/world/vector'
+Aether.addGlobal '_', _
+
+transpileLevelSession = (sessionID, cb) ->
+ query = LevelSession.findOne("_id": sessionID).select("submittedCode").lean()
+ query.exec (err, session) ->
+ if err then return cb err
+ submittedCode = session.submittedCode
+ transpiledCode = {}
+ console.log "Updating session #{sessionID}"
+ for thang, spells of submittedCode
+ transpiledCode[thang] = {}
+ for spellID, spell of spells
+
+ aetherOptions =
+ problems: {}
+ language: "javascript"
+ functionName: spellID
+ functionParameters: []
+ yieldConditionally: spellID is "plan"
+ globals: ['Vector', '_']
+ protectAPI: true
+ includeFlow: false
+ if spellID is "hear" then aetherOptions["functionParameters"] = ["speaker","message","data"]
+
+ aether = new Aether aetherOptions
+ transpiledCode[thang][spellID] = aether.transpile spell
+ conditions =
+ "_id": sessionID
+ update =
+ "transpiledCode": transpiledCode
+ "submittedCodeLanguage": "javascript"
+ query = LevelSession.update(conditions,update)
+
+ query.exec (err, numUpdated) -> cb err
+
+findLadderLevelSessions = (levelID, cb) ->
+ queryParameters =
+ "level.original": levelID + ""
+ submitted: true
+
+ selectString = "_id"
+ query = LevelSession.find(queryParameters).select(selectString).lean()
+
+ query.exec (err, levelSessions) ->
+ if err then return cb err
+ levelSessionIDs = _.pluck levelSessions, "_id"
+ async.eachSeries levelSessionIDs, transpileLevelSession, (err) ->
+ if err then return cb err
+ cb null
+
+
+transpileLadderSessions = ->
+ queryParameters =
+ type: "ladder"
+ "version.isLatestMajor": true
+ "version.isLatestMinor": true
+ selectString = "original"
+ query = Level.find(queryParameters).select(selectString).lean()
+
+ query.exec (err, ladderLevels) ->
+ throw err if err
+ ladderLevels = _.pluck ladderLevels, "original"
+ async.eachSeries ladderLevels, findLadderLevelSessions, (err) ->
+ throw err if err
+
+serverSetup.connectToDatabase()
+transpileLadderSessions()
+
+
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/config.coco b/scripts/windows/coco-dev-setup/batch/config/config.coco
index eba46b0f4..da381689f 100755
--- a/scripts/windows/coco-dev-setup/batch/config/config.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/config.coco
@@ -1,8 +1,9 @@
\n' \ No newline at end of file + #html: message.replace '\n', '
\n' + + if recipientID and (user.isAdmin() or ('employer' in (user.permissions ? []))) + User.findById(recipientID, 'email').exec (err, document) -> + if err + log.error "Error looking up recipient to email from #{recipientID}: #{err}" if err + else + options.bcc = options.to + options.to = document.get('email') + done options + else + done options diff --git a/server/routes/db.coffee b/server/routes/db.coffee index 723e15b90..f65a56744 100644 --- a/server/routes/db.coffee +++ b/server/routes/db.coffee @@ -1,12 +1,12 @@ log = require 'winston' errors = require '../commons/errors' handlers = require('../commons/mapping').handlers -schemas = require('../commons/mapping').schemas mongoose = require 'mongoose' module.exports.setup = (app) -> # This is hacky and should probably get moved somewhere else, I dunno app.get '/db/cla.submissions', (req, res) -> + return errors.unauthorized(res, "You must be an admin to view that information") unless req.user?.isAdmin() res.setHeader('Content-Type', 'application/json') collection = mongoose.connection.db.collection 'cla.submissions', (err, collection) -> return log.error "Couldn't fetch CLA submissions because #{err}" if err @@ -35,6 +35,7 @@ module.exports.setup = (app) -> return handler.versions(req, res, parts[1]) if parts[2] is 'versions' return handler.files(req, res, parts[1]) if parts[2] is 'files' return handler.search(req, res) if req.route.method is 'get' and parts[1] is 'search' + return handler.getNamesByIDs(req, res) if req.route.method in ['get', 'post'] and parts[1] is 'names' return handler.getByRelationship(req, res, parts[1..]...) if parts.length > 2 return handler.getById(req, res, parts[1]) if req.route.method is 'get' and parts[1]? return handler.patch(req, res, parts[1]) if req.route.method is 'patch' and parts[1]? @@ -42,14 +43,15 @@ module.exports.setup = (app) -> catch error log.error("Error trying db method #{req.route.method} route #{parts} from #{name}: #{error}") log.error(error) + log.error(error.stack) errors.notFound(res, "Route #{req.path} not found.") getSchema = (req, res, moduleName) -> try - name = schemas[moduleName.replace '.', '_'] - schema = require('../' + name) + name = moduleName.replace '.', '_' + schema = require('../../app/schemas/models/' + name) - res.send(schema) + res.send(JSON.stringify(schema, null, '\t')) res.end() catch error diff --git a/server/routes/file.coffee b/server/routes/file.coffee index 7a16c3709..1cc0f73d7 100644 --- a/server/routes/file.coffee +++ b/server/routes/file.coffee @@ -19,7 +19,7 @@ fileGet = (req, res) -> objectId = mongoose.Types.ObjectId(path) query = objectId catch e - path = path.split('/') + path = path.split('/') filename = path[path.length-1] path = path[...path.length-1].join('/') query = @@ -34,7 +34,7 @@ fileGet = (req, res) -> res.setHeader('Content-Type', 'text/json') res.send(results) res.end() - + else Grid.gfs.collection('media').findOne query, (err, filedata) => return errors.notFound(res) if not filedata @@ -42,7 +42,7 @@ fileGet = (req, res) -> if req.headers['if-modified-since'] is filedata.uploadDate res.status(304) return res.end() - + res.setHeader('Content-Type', filedata.contentType) res.setHeader('Last-Modified', filedata.uploadDate) res.setHeader('Cache-Control', 'public') @@ -70,7 +70,7 @@ postFileSchema = required: ['filename', 'mimetype', 'path'] filePost = (req, res) -> - return errors.forbidden(res) unless req.user?.isAdmin() + return errors.forbidden(res) unless req.user options = req.body tv4 = require('tv4').tv4 valid = tv4.validate(options, postFileSchema) @@ -83,7 +83,7 @@ filePost = (req, res) -> saveURL = (req, res) -> options = createPostOptions(req) - checkExistence options, res, req.body.force, (err) -> + checkExistence options, req, res, req.body.force, (err) -> return errors.serverError(res) if err writestream = Grid.gfs.createWriteStream(options) request(req.body.url).pipe(writestream) @@ -91,7 +91,7 @@ saveURL = (req, res) -> saveFile = (req, res) -> options = createPostOptions(req) - checkExistence options, res, req.body.force, (err) -> + checkExistence options, req, res, req.body.force, (err) -> return if err writestream = Grid.gfs.createWriteStream(options) f = req.files[req.body.postName] @@ -101,8 +101,8 @@ saveFile = (req, res) -> savePNG = (req, res) -> options = createPostOptions(req) - checkExistence options, res, req.body.force, (err) -> - return errors.serverError(res) if err + checkExistence options, req, res, req.body.force, (err) -> + return if err writestream = Grid.gfs.createWriteStream(options) img = new Buffer(req.body.b64png, 'base64') streamBuffers = require 'stream-buffers' @@ -110,21 +110,32 @@ savePNG = (req, res) -> myReadableStreamBuffer.put(img) myReadableStreamBuffer.pipe(writestream) handleStreamEnd(res, writestream) + +userCanEditFile = (user=null, file=null) -> + # no user means 'anyone'. No file means 'any file' + return false unless user + return true if user.isAdmin() + return false unless file + return true if file.metadata.creator is user.id + return false -checkExistence = (options, res, force, done) -> +checkExistence = (options, req, res, force, done) -> q = { filename: options.filename 'metadata.path': options.metadata.path } Grid.gfs.collection('media').find(q).toArray (err, files) -> - if files.length and not force - errors.conflict(res) + file = files[0] + if file and ((not userCanEditFile(req.user, file) or (not force))) + errors.conflict(res, {canForce:userCanEditFile(req.user, file)}) done(true) - else if files.length - q = { _id: files[0]._id } + else if file + q = { _id: file._id } q.root = 'media' Grid.gfs.remove q, (err) -> - return errors.serverError(res) if err + if err + errors.serverError(res) + return done(true) done() else done() @@ -143,11 +154,11 @@ createPostOptions = (req) -> unless req.body.name name = req.body.filename.split('.')[0] req.body.name = _.str.humanize(name) - + path = req.body.path or '' path = path[1...] if path and path[0] is '/' path = path[...path.length-2] if path and path[path.length-1] is '/' - + options = mode: 'w' filename: req.body.filename @@ -158,6 +169,6 @@ createPostOptions = (req) -> name: req.body.name path: path creator: ''+req.user._id - options.metadata.description = req.body.description if req.body.description? + options.metadata.description = req.body.description if req.body.description? options diff --git a/server/routes/mail.coffee b/server/routes/mail.coffee index 6527e4a26..e7c2ee361 100644 --- a/server/routes/mail.coffee +++ b/server/routes/mail.coffee @@ -1,5 +1,4 @@ mail = require '../commons/mail' -map = _.invert mail.MAILCHIMP_GROUP_MAP User = require '../users/User.coffee' errors = require '../commons/errors' #request = require 'request' @@ -37,8 +36,9 @@ getTimeFromDaysAgo = (now, daysAgo) -> t = now - 86400 * 1000 * daysAgo - LADDER_PREGAME_INTERVAL isRequestFromDesignatedCronHandler = (req, res) -> - if req.ip isnt config.mail.cronHandlerPublicIP and req.ip isnt config.mail.cronHandlerPrivateIP - console.log "RECEIVED REQUEST FROM IP #{req.ip}(headers indicate #{req.headers['x-forwarded-for']}" + requestIP = req.headers['x-forwarded-for']?.replace(" ","").split(",")[0] + if requestIP isnt config.mail.cronHandlerPublicIP and requestIP isnt config.mail.cronHandlerPrivateIP + console.log "RECEIVED REQUEST FROM IP #{requestIP}(headers indicate #{req.headers['x-forwarded-for']}" console.log "UNAUTHORIZED ATTEMPT TO SEND TRANSACTIONAL LADDER EMAIL THROUGH CRON MAIL HANDLER" res.send("You aren't authorized to perform that action. Only the specified Cron handler may perform that action.") res.end() @@ -53,7 +53,7 @@ handleLadderUpdate = (req, res) -> res.send('Great work, Captain Cron! I can take it from here.') res.end() # TODO: somehow fetch the histograms - emailDays = [1, 2, 4, 7, 30] + emailDays = [1, 2, 4, 7, 14, 30] now = new Date() for daysAgo in emailDays # Get every session that was submitted in a 5-minute window after the time. @@ -76,17 +76,18 @@ handleLadderUpdate = (req, res) -> sendLadderUpdateEmail result, now, daysAgo for result in results sendLadderUpdateEmail = (session, now, daysAgo) -> - User.findOne({_id: session.creator}).select("name email firstName lastName emailSubscriptions preferredLanguage").lean().exec (err, user) -> + User.findOne({_id: session.creator}).select("name email firstName lastName emailSubscriptions emails preferredLanguage").exec (err, user) -> if err log.error "Couldn't find user for #{session.creator} from session #{session._id}" return - unless user.email and ('notification' in user.emailSubscriptions) and not session.unsubscribed - log.info "Not sending email to #{user.email} #{user.name} because they only want emails about #{user.emailSubscriptions} - session unsubscribed: #{session.unsubscribed}" + allowNotes = user.isEmailSubscriptionEnabled 'anyNotes' + unless user.get('email') and allowNotes and not session.unsubscribed + log.info "Not sending email to #{user.get('email')} #{user.get('name')} because they only want emails about #{user.get('emailSubscriptions')}, #{user.get('emails')} - session unsubscribed: #{session.unsubscribed}" return unless session.levelName - log.info "Not sending email to #{user.email} #{user.name} because the session had no levelName in it." + log.info "Not sending email to #{user.get('email')} #{user.get('name')} because the session had no levelName in it." return - name = if user.firstName and user.lastName then "#{user.firstName}" else user.name + name = if user.get('firstName') and user.get('lastName') then "#{user.get('firstName')}" else user.get('name') name = "Wizard" if not name or name is "Anoner" # Fetch the most recent defeat and victory, if there are any. @@ -107,7 +108,7 @@ sendLadderUpdateEmail = (session, now, daysAgo) -> context = email_id: sendwithus.templates.ladder_update_email recipient: - address: if DEBUGGING then 'nick@codecombat.com' else user.email + address: if DEBUGGING then 'nick@codecombat.com' else user.get('email') name: name email_data: name: name @@ -197,13 +198,11 @@ handleMailchimpWebHook = (req, res) -> return errors.serverError(res) if err res.end('Success') +module.exports.handleProfileUpdate = handleProfileUpdate = (user, post) -> + mailchimpSubs = post.data.merges.INTERESTS.split(', ') -handleProfileUpdate = (user, post) -> - groups = post.data.merges.INTERESTS.split(', ') - groups = (map[g] for g in groups when map[g]) - otherSubscriptions = (g for g in user.get('emailSubscriptions') when not mail.MAILCHIMP_GROUP_MAP[g]) - groups = groups.concat otherSubscriptions - user.set 'emailSubscriptions', groups + for [mailchimpEmailGroup, emailGroup] in _.zip(mail.MAILCHIMP_GROUPS, mail.NEWS_GROUPS) + user.setEmailSubscription emailGroup, mailchimpEmailGroup in mailchimpSubs fname = post.data.merges.FNAME user.set('firstName', fname) if fname @@ -216,7 +215,9 @@ handleProfileUpdate = (user, post) -> # badLog("Updating user object to: #{JSON.stringify(user.toObject(), null, '\t')}") -handleUnsubscribe = (user) -> +module.exports.handleUnsubscribe = handleUnsubscribe = (user) -> user.set 'emailSubscriptions', [] + for emailGroup in mail.NEWS_GROUPS + user.setEmailSubscription emailGroup, false # badLog("Unsubscribing user object to: #{JSON.stringify(user.toObject(), null, '\t')}") diff --git a/server/routes/queue.coffee b/server/routes/queue.coffee index 18d8cc80b..388bce4e0 100644 --- a/server/routes/queue.coffee +++ b/server/routes/queue.coffee @@ -18,6 +18,13 @@ module.exports.setup = (app) -> handler = loadQueueHandler 'scoring' handler.resimulateAllSessions req, res + app.post '/queue/scoring/getTwoGames', (req, res) -> + handler = loadQueueHandler 'scoring' + handler.getTwoGames req, res + + app.put '/queue/scoring/recordTwoGames', (req, res) -> + handler = loadQueueHandler 'scoring' + handler.recordTwoGames req, res app.all '/queue/*', (req, res) -> setResponseHeaderToJSONContentType res diff --git a/server/sendwithus.coffee b/server/sendwithus.coffee index ad7a07500..1f8145eb1 100644 --- a/server/sendwithus.coffee +++ b/server/sendwithus.coffee @@ -1,14 +1,17 @@ config = require '../server_config' sendwithusAPI = require 'sendwithus' swuAPIKey = config.mail.sendwithusAPIKey -queues = require './commons/queue' module.exports.setupRoutes = (app) -> return - debug = not config.isProduction module.exports.api = new sendwithusAPI swuAPIKey, debug +if config.unittest + module.exports.api.send = -> module.exports.templates = welcome_email: 'utnGaBHuSU4Hmsi7qrAypU' ladder_update_email: 'JzaZxf39A4cKMxpPZUfWy4' + patch_created: 'tem_xhxuNosLALsizTNojBjNcL' + change_made_notify_watcher: 'tem_7KVkfmv9SZETb25dtHbUtG' + one_time_recruiting_email: 'tem_mdFMgtcczHKYu94Jmq68j8' diff --git a/server/users/User.coffee b/server/users/User.coffee index 28009e610..744b8db7b 100644 --- a/server/users/User.coffee +++ b/server/users/User.coffee @@ -1,5 +1,5 @@ mongoose = require('mongoose') -jsonschema = require('./user_schema') +jsonschema = require('../../app/schemas/models/user') crypto = require('crypto') {salt, isProduction} = require('../../server_config') mail = require '../commons/mail' @@ -16,33 +16,66 @@ UserSchema = new mongoose.Schema({ UserSchema.pre('init', (next) -> return next() unless jsonschema.properties? for prop, sch of jsonschema.properties + continue if prop is 'emails' # defaults may change, so don't carry them over just yet @set(prop, sch.default) if sch.default? - @set('permissions', ['admin']) if not isProduction next() ) UserSchema.post('init', -> @set('anonymous', false) if @get('email') - @currentSubscriptions = JSON.stringify(@get('emailSubscriptions')) ) UserSchema.methods.isAdmin = -> p = @get('permissions') return p and 'admin' in p +emailNameMap = + generalNews: 'announcement' + adventurerNews: 'tester' + artisanNews: 'level_creator' + archmageNews: 'developer' + scribeNews: 'article_editor' + diplomatNews: 'translator' + ambassadorNews: 'support' + anyNotes: 'notification' + +UserSchema.methods.setEmailSubscription = (newName, enabled) -> + oldSubs = _.clone @get('emailSubscriptions') + if oldSubs and oldName = emailNameMap[newName] + oldSubs = (s for s in oldSubs when s isnt oldName) + oldSubs.push(oldName) if enabled + @set('emailSubscriptions', oldSubs) + + newSubs = _.clone(@get('emails') or _.cloneDeep(jsonschema.properties.emails.default)) + newSubs[newName] ?= {} + newSubs[newName].enabled = enabled + @set('emails', newSubs) + @newsSubsChanged = true if newName in mail.NEWS_GROUPS + +UserSchema.methods.isEmailSubscriptionEnabled = (newName) -> + emails = @get 'emails' + if not emails + oldSubs = @get('emailSubscriptions') + oldName = emailNameMap[newName] + return oldName and oldName in oldSubs if oldSubs + emails ?= {} + _.defaults emails, _.cloneDeep(jsonschema.properties.emails.default) + return emails[newName]?.enabled + UserSchema.statics.updateMailChimp = (doc, callback) -> - return callback?() unless isProduction + return callback?() unless isProduction or GLOBAL.testing return callback?() if doc.updatedMailChimp return callback?() unless doc.get('email') existingProps = doc.get('mailChimp') emailChanged = (not existingProps) or existingProps?.email isnt doc.get('email') - emailSubs = doc.get('emailSubscriptions') - gm = mail.MAILCHIMP_GROUP_MAP - newGroups = (gm[name] for name in emailSubs when gm[name]?) + return callback?() unless emailChanged or doc.newsSubsChanged + + newGroups = [] + for [mailchimpEmailGroup, emailGroup] in _.zip(mail.MAILCHIMP_GROUPS, mail.NEWS_GROUPS) + newGroups.push(mailchimpEmailGroup) if doc.isEmailSubscriptionEnabled(emailGroup) + if (not existingProps) and newGroups.length is 0 return callback?() # don't add totally unsubscribed people to the list - subsChanged = doc.currentSubscriptions isnt JSON.stringify(emailSubs) - return callback?() unless emailChanged or subsChanged params = {} params.id = mail.MAILCHIMP_LIST_ID @@ -62,7 +95,7 @@ UserSchema.statics.updateMailChimp = (doc, callback) -> doc.updatedMailChimp = true callback?() - mc.lists.subscribe params, onSuccess, onFailure + mc?.lists.subscribe params, onSuccess, onFailure UserSchema.pre('save', (next) -> @@ -74,12 +107,13 @@ UserSchema.pre('save', (next) -> @set('password', undefined) if @get('email') and @get('anonymous') @set('anonymous', false) + @set('permissions', ['admin']) if not isProduction data = email_id: sendwithus.templates.welcome_email recipient: address: @get 'email' sendwithus.api.send data, (err, result) -> - log.error 'error', err, 'result', result if err + log.error "sendwithus post-save error: #{err}, result: #{result}" if err next() ) diff --git a/server/users/user_handler.coffee b/server/users/user_handler.coffee index 168f10d91..f7723f859 100644 --- a/server/users/user_handler.coffee +++ b/server/users/user_handler.coffee @@ -1,4 +1,4 @@ -schema = require './user_schema' +schema = require '../../app/schemas/models/user' crypto = require 'crypto' request = require 'request' User = require './User' @@ -9,11 +9,15 @@ errors = require '../commons/errors' async = require 'async' log = require 'winston' LevelSession = require('../levels/sessions/LevelSession') +LevelSessionHandler = require '../levels/sessions/level_session_handler' serverProperties = ['passwordHash', 'emailLower', 'nameLower', 'passwordReset'] privateProperties = [ 'permissions', 'email', 'firstName', 'lastName', 'gender', 'facebookID', - 'gplusID', 'music', 'volume', 'aceConfig' + 'gplusID', 'music', 'volume', 'aceConfig', 'employerAt', 'signedEmployerAgreement' +] +candidateProperties = [ + 'jobProfile', 'jobProfileApproved', 'jobProfileNotes' ] UserHandler = class UserHandler extends Handler @@ -21,9 +25,9 @@ UserHandler = class UserHandler extends Handler editableProperties: [ 'name', 'photoURL', 'password', 'anonymous', 'wizardColor1', 'volume', - 'firstName', 'lastName', 'gender', 'facebookID', 'gplusID', 'emailSubscriptions', + 'firstName', 'lastName', 'gender', 'facebookID', 'gplusID', 'emails', 'testGroupNumber', 'music', 'hourOfCode', 'hourOfCodeComplete', 'preferredLanguage', - 'wizard', 'aceConfig', 'autocastDelay', 'lastLevel' + 'wizard', 'aceConfig', 'autocastDelay', 'lastLevel', 'jobProfile' ] jsonSchema: schema @@ -32,21 +36,19 @@ UserHandler = class UserHandler extends Handler super(arguments...) @editableProperties.push('permissions') unless config.isProduction + getEditableProperties: (req, document) -> + props = super req, document + props.push 'jobProfileApproved', 'jobProfileNotes' if req.user.isAdmin() + props + formatEntity: (req, document) -> return null unless document? obj = document.toObject() delete obj[prop] for prop in serverProperties - includePrivates = req.user and (req.user?.isAdmin() or req.user?._id.equals(document._id)) + includePrivates = req.user and (req.user.isAdmin() or req.user._id.equals(document._id)) delete obj[prop] for prop in privateProperties unless includePrivates - - # emailHash is used by gravatar - hash = crypto.createHash('md5') - if document.get('email') - hash.update(_.trim(document.get('email')).toLowerCase()) - else - hash.update(@_id+'') - obj.emailHash = hash.digest('hex') - + includeCandidate = includePrivates or (obj.jobProfileApproved and req.user and ('employer' in (req.user.get('permissions') ? [])) and @employerCanViewCandidate req.user, obj) + delete obj[prop] for prop in candidateProperties unless includeCandidate return obj waterfallFunctions: [ @@ -103,11 +105,13 @@ UserHandler = class UserHandler extends Handler (req, user, callback) -> return callback(null, req, user) unless req.body.name nameLower = req.body.name?.toLowerCase() - return callback(null, req, user) if nameLower is user.get('nameLower') - User.findOne({nameLower:nameLower}).exec (err, otherUser) -> + return callback(null, req, user) unless nameLower + return callback(null, req, user) if nameLower is user.get('nameLower') and not user.get('anonymous') + User.findOne({nameLower:nameLower,anonymous:false}).exec (err, otherUser) -> log.error "Database error setting user name: #{err}" if err return callback(res:'Database error.', code:500) if err r = {message:'is already used by another account', property:'name'} + console.log 'Another user exists' if otherUser return callback({res:r, code:409}) if otherUser user.set('name', req.body.name) callback(null, req, user) @@ -115,43 +119,56 @@ UserHandler = class UserHandler extends Handler getById: (req, res, id) -> if req.user?._id.equals(id) - return @sendSuccess(res, @formatEntity(req, req.user)) + return @sendSuccess(res, @formatEntity(req, req.user, 256)) super(req, res, id) - getNamesByIds: (req, res) -> + getNamesByIDs: (req, res) -> ids = req.query.ids or req.body.ids - ids = ids.split(',') if _.isString ids - ids = _.uniq ids - - # TODO: Extend and repurpose this handler to return other public info about a user more flexibly, - # say by a query parameter that lists public properties to return. returnWizard = req.query.wizard or req.body.wizard - query = if returnWizard then {name:1, wizard:1} else {name:1} - - makeFunc = (id) -> - (callback) -> - User.findById(id, query).exec (err, document) -> - return done(err) if err - if document and returnWizard - callback(null, {name:document.get('name'), wizard:document.get('wizard') or {}}) - else - callback(null, document?.get('name') or '') - - funcs = {} - for id in ids - return errors.badInput(res, "Given an invalid id: #{id}") unless Handler.isID(id) - funcs[id] = makeFunc(id) - - async.parallel funcs, (err, results) -> - return errors.serverError err if err - res.send results - res.end() + properties = if returnWizard then "name wizard" else "name" + @getPropertiesFromMultipleDocuments res, User, properties, ids nameToID: (req, res, name) -> - User.findOne({nameLower:name.toLowerCase()}).exec (err, otherUser) -> + User.findOne({nameLower:name.toLowerCase(),anonymous:false}).exec (err, otherUser) -> res.send(if otherUser then otherUser._id else JSON.stringify('')) res.end() + getSimulatorLeaderboard: (req, res) -> + queryParameters = @getSimulatorLeaderboardQueryParameters(req) + leaderboardQuery = User.find(queryParameters.query).select("name simulatedBy simulatedFor").sort({"simulatedBy":queryParameters.sortOrder}).limit(queryParameters.limit) + leaderboardQuery.exec (err, otherUsers) -> + otherUsers = _.reject otherUsers, _id: req.user._id if req.query.scoreOffset isnt -1 + otherUsers ?= [] + res.send(otherUsers) + res.end() + + getMySimulatorLeaderboardRank: (req, res) -> + req.query.order = 1 + queryParameters = @getSimulatorLeaderboardQueryParameters(req) + User.count queryParameters.query, (err, count) => + return @sendDatabaseError(res, err) if err + res.send JSON.stringify(count + 1) + + getSimulatorLeaderboardQueryParameters: (req) -> + @validateSimulateLeaderboardRequestParameters(req) + + query = {} + sortOrder = -1 + limit = if req.query.limit > 30 then 30 else req.query.limit + if req.query.scoreOffset isnt -1 + simulatedByQuery = {} + simulatedByQuery[if req.query.order is 1 then "$gt" else "$lte"] = req.query.scoreOffset + query.simulatedBy = simulatedByQuery + sortOrder = 1 if req.query.order is 1 + else + query.simulatedBy = {"$exists": true} + {query: query, sortOrder: sortOrder, limit: limit} + + validateSimulateLeaderboardRequestParameters: (req) -> + req.query.order = parseInt(req.query.order) ? -1 + req.query.scoreOffset = parseFloat(req.query.scoreOffset) ? 100000 + req.query.limit = parseInt(req.query.limit) ? 20 + post: (req, res) -> return @sendBadInputError(res, 'No input.') if _.isEmpty(req.body) return @sendBadInputError(res, 'Must have an anonymous user to post with.') unless req.user @@ -167,11 +184,16 @@ UserHandler = class UserHandler extends Handler getByRelationship: (req, res, args...) -> return @agreeToCLA(req, res) if args[1] is 'agreeToCLA' + return @agreeToEmployerAgreement(req,res) if args[1] is 'agreeToEmployerAgreement' return @avatar(req, res, args[0]) if args[1] is 'avatar' - return @getNamesByIds(req, res) if args[1] is 'names' + return @getNamesByIDs(req, res) if args[1] is 'names' return @nameToID(req, res, args[0]) if args[1] is 'nameToID' return @getLevelSessions(req, res, args[0]) if args[1] is 'level.sessions' + return @getCandidates(req, res) if args[1] is 'candidates' + return @getSimulatorLeaderboard(req, res, args[0]) if args[1] is 'simulatorLeaderboard' + return @getMySimulatorLeaderboardRank(req, res, args[0]) if args[1] is 'simulator_leaderboard_rank' return @sendNotFoundError(res) + super(arguments...) agreeToCLA: (req, res) -> return @sendUnauthorizedError(res) unless req.user @@ -191,9 +213,14 @@ UserHandler = class UserHandler extends Handler @sendSuccess(res, {result:'success'}) avatar: (req, res, id) -> - @modelClass.findById(id).exec (err, document) -> + @modelClass.findById(id).exec (err, document) => return @sendDatabaseError(res, err) if err - res.redirect(document?.get('photoURL') or '/images/generic-wizard-icon.png') + photoURL = document?.get('photoURL') + if photoURL + photoURL = "/file/#{photoURL}" + else + photoURL = @buildGravatarURL document, req.query.s, req.query.fallback + res.redirect photoURL res.end() getLevelSessions: (req, res, userID) -> @@ -205,8 +232,84 @@ UserHandler = class UserHandler extends Handler projection[field] = 1 for field in req.query.project.split(',') LevelSession.find(query).select(projection).exec (err, documents) => return @sendDatabaseError(res, err) if err - documents = (@formatEntity(req, doc) for doc in documents) + documents = (LevelSessionHandler.formatEntity(req, doc) for doc in documents) @sendSuccess(res, documents) + agreeToEmployerAgreement: (req, res) -> + userIsAnonymous = req.user?.get('anonymous') + if userIsAnonymous then return errors.unauthorized(res, "You need to be logged in to agree to the employer agreeement.") + profileData = req.body + #TODO: refactor this bit to make it more elegant + if not profileData.id or not profileData.positions or not profileData.emailAddress or not profileData.firstName or not profileData.lastName + return errors.badInput(res, "You need to have a more complete profile to sign up for this service.") + @modelClass.findById(req.user.id).exec (err, user) => + if user.get('employerAt') or user.get('signedEmployerAgreement') or "employer" in user.get('permissions') + return errors.conflict(res, "You already have signed the agreement!") + #TODO: Search for the current position + employerAt = _.filter(profileData.positions.values,"isCurrent")[0]?.company.name ? "Not available" + signedEmployerAgreement = + linkedinID: profileData.id + date: new Date() + data: profileData + updateObject = + "employerAt": employerAt + "signedEmployerAgreement": signedEmployerAgreement + $push: "permissions":'employer' + + User.update {"_id": req.user.id}, updateObject, (err, result) => + if err? then return errors.serverError(res, "There was an issue updating the user object to reflect employer status: #{err}") + res.send({"message": "The agreement was successful."}) + res.end() + + getCandidates: (req, res) -> + authorized = req.user.isAdmin() or ('employer' in req.user.get('permissions')) + since = (new Date((new Date()) - 2 * 30.4 * 86400 * 1000)).toISOString() + #query = {'jobProfile.active': true, 'jobProfile.updated': {$gt: since}} + query = {'jobProfile.updated': {$gt: since}} + query.jobProfileApproved = true unless req.user.isAdmin() + query['jobProfile.active'] = true unless req.user.isAdmin() + selection = 'jobProfile' + selection += ' email' if authorized + selection += ' jobProfileApproved' if req.user.isAdmin() + User.find(query).select(selection).exec (err, documents) => + return @sendDatabaseError(res, err) if err + candidates = (candidate for candidate in documents when @employerCanViewCandidate req.user, candidate.toObject()) + candidates = (@formatCandidate(authorized, candidate) for candidate in candidates) + @sendSuccess(res, candidates) + + formatCandidate: (authorized, document) -> + fields = if authorized then ['jobProfile', 'jobProfileApproved', 'photoURL', '_id'] else ['jobProfile'] + obj = _.pick document.toObject(), fields + obj.photoURL ||= obj.jobProfile.photoURL if authorized + subfields = ['country', 'city', 'lookingFor', 'jobTitle', 'skills', 'experience', 'updated', 'active'] + if authorized + subfields = subfields.concat ['name'] + obj.jobProfile = _.pick obj.jobProfile, subfields + obj + + employerCanViewCandidate: (employer, candidate) -> + return true if employer.isAdmin() + for job in candidate.jobProfile?.work ? [] + # TODO: be smarter about different ways to write same company names to ensure privacy. + # We'll have to manually pay attention to how we set employer names for now. + if job.employer?.toLowerCase() is employer.get('employerAt')?.toLowerCase() + log.info "#{employer.get('name')} at #{employer.get('employerAt')} can't see #{candidate.jobProfile.name} because s/he worked there." + return false if job.employer?.toLowerCase() is employer.get('employerAt')?.toLowerCase() + true + + buildGravatarURL: (user, size, fallback) -> + emailHash = @buildEmailHash user + fallback ?= "http://codecombat.com/file/db/thang.type/52a00d55cf1818f2be00000b/portrait.png" + fallback = "http://codecombat.com#{fallback}" unless /^http/.test fallback + "https://www.gravatar.com/avatar/#{emailHash}?s=#{size}&default=#{fallback}" + + buildEmailHash: (user) -> + # emailHash is used by gravatar + hash = crypto.createHash('md5') + if user.get('email') + hash.update(_.trim(user.get('email')).toLowerCase()) + else + hash.update(user.get('_id') + '') + hash.digest('hex') module.exports = new UserHandler() diff --git a/server/users/user_schema.coffee b/server/users/user_schema.coffee deleted file mode 100644 index 18d526de5..000000000 --- a/server/users/user_schema.coffee +++ /dev/null @@ -1,61 +0,0 @@ -c = require '../commons/schemas' -emailSubscriptions = ['announcement', 'tester', 'level_creator', 'developer', 'article_editor', 'translator', 'support', 'notification'] - -UserSchema = c.object {}, - name: c.shortString({title: 'Display Name', default:''}) - email: c.shortString({title: 'Email', format: 'email'}) - firstName: c.shortString({title: 'First Name'}) - lastName: c.shortString({title: 'Last Name'}) - gender: {type: 'string', 'enum': ['male', 'female']} - password: {type: 'string', maxLength: 256, minLength: 2, title:'Password'} - passwordReset: {type: 'string'} - photoURL: {type: 'string', format: 'url', required: false} - - facebookID: c.shortString({title: 'Facebook ID'}) - gplusID: c.shortString({title: 'G+ ID'}) - - wizardColor1: c.pct({title: 'Wizard Clothes Color'}) - volume: c.pct({title: 'Volume'}) - music: {type: 'boolean', default: true} - autocastDelay: {type: 'integer', 'default': 5000 } - lastLevel: { type: 'string' } - - emailSubscriptions: c.array {uniqueItems: true, 'default': ['announcement', 'notification']}, {'enum': emailSubscriptions} - - # server controlled - permissions: c.array {'default': []}, c.shortString() - dateCreated: c.date({title: 'Date Joined'}) - anonymous: {type: 'boolean', 'default': true} - testGroupNumber: {type: 'integer', minimum: 0, maximum: 256, exclusiveMaximum: true} - mailChimp: {type: 'object'} - hourOfCode: {type: 'boolean'} - hourOfCodeComplete: {type: 'boolean'} - - emailLower: c.shortString() - nameLower: c.shortString() - passwordHash: {type: 'string', maxLength: 256} - - # client side - #gravatarProfile: {} (should only ever be kept locally) - emailHash: {type: 'string'} - - #Internationalization stuff - preferredLanguage: {type: 'string', default: 'en', 'enum': c.getLanguageCodeArray()} - - signedCLA: c.date({title: 'Date Signed the CLA'}) - wizard: c.object {}, - colorConfig: c.object {additionalProperties: c.colorConfig()} - - aceConfig: c.object {}, - language: {type: 'string', 'default': 'javascript', 'enum': ['javascript', 'coffeescript']} - keyBindings: {type: 'string', 'default': 'default', 'enum': ['default', 'vim', 'emacs']} - invisibles: {type: 'boolean', 'default': false} - indentGuides: {type: 'boolean', 'default': false} - behaviors: {type: 'boolean', 'default': false} - - simulatedBy: {type: 'integer', minimum: 0, default: 0} - simulatedFor: {type: 'integer', minimum: 0, default: 0} - -c.extendBasicProperties UserSchema, 'user' - -module.exports = UserSchema diff --git a/server_setup.coffee b/server_setup.coffee index c06482a85..d214497cb 100644 --- a/server_setup.coffee +++ b/server_setup.coffee @@ -3,6 +3,8 @@ path = require 'path' authentication = require 'passport' useragent = require 'express-useragent' fs = require 'graceful-fs' +log = require 'winston' +compressible = require 'compressible' database = require './server/commons/database' baseRoute = require './server/routes/base' @@ -10,17 +12,7 @@ user = require './server/users/user_handler' logging = require './server/commons/logging' config = require './server_config' auth = require './server/routes/auth' -UserHandler = require('./server/users/user_handler') - -###Middleware setup functions implementation### -# 2014-03-03: Try not using this and see if it's still a problem -#setupRequestTimeoutMiddleware = (app) -> -# app.use (req, res, next) -> -# req.setTimeout 15000, -> -# console.log 'timed out!' -# req.abort() -# self.emit('pass',message) -# next() +UserHandler = require './server/users/user_handler' productionLogging = (tokens, req, res) -> status = res.statusCode @@ -30,15 +22,17 @@ productionLogging = (tokens, req, res) -> else if status >= 300 then color = 36 elapsed = (new Date()) - req._startTime elapsedColor = if elapsed < 500 then 90 else 31 - if (status isnt 200 and status isnt 304) or elapsed > 500 + if (status isnt 200 and status isnt 204 and status isnt 304 and status isnt 302) or elapsed > 500 return "\x1b[90m#{req.method} #{req.originalUrl} \x1b[#{color}m#{res.statusCode} \x1b[#{elapsedColor}m#{elapsed}ms\x1b[0m" null setupExpressMiddleware = (app) -> - #setupRequestTimeoutMiddleware app if config.isProduction express.logger.format('prod', productionLogging) app.use(express.logger('prod')) + app.use express.compress filter: (req, res) -> + return false if req.headers.host is 'codecombat.com' # Cloudflare will gzip it for us on codecombat.com + compressible res.getHeader('Content-Type') else app.use(express.logger('dev')) app.use(express.static(path.join(__dirname, 'public'))) @@ -49,7 +43,6 @@ setupExpressMiddleware = (app) -> app.use(express.bodyParser()) app.use(express.methodOverride()) app.use(express.cookieSession({secret:'defenestrate'})) - #app.use(express.compress()) if config.isProduction # just let Cloudflare do it setupPassportMiddleware = (app) -> app.use(authentication.initialize()) @@ -96,9 +89,10 @@ setupFallbackRouteToIndex = (app) -> auth.loginUser(req, res, user, false, next) sendMain = (req, res) -> - fs.readFile path.join(__dirname, 'public', 'main.html'), 'utf8', (err,data) -> - # insert the user object directly into the html so the application can have it immediately - data = data.replace('"userObjectTag"', JSON.stringify(UserHandler.formatEntity(req, req.user))) + fs.readFile path.join(__dirname, 'public', 'main.html'), 'utf8', (err, data) -> + log.error "Error modifying main.html: #{err}" if err + # insert the user object directly into the html so the application can have it immediately. Sanitize + data = data.replace('"userObjectTag"', JSON.stringify(UserHandler.formatEntity(req, req.user)).replace(/\//g, '\\/')) res.send data setupFacebookCrossDomainCommunicationRoute = (app) -> diff --git a/test/app/lib/surface/camera.spec.coffee b/test/app/lib/surface/camera.spec.coffee index 48c4439bc..8019cd38f 100644 --- a/test/app/lib/surface/camera.spec.coffee +++ b/test/app/lib/surface/camera.spec.coffee @@ -98,25 +98,25 @@ describe 'Camera (Surface point of view)', -> checkCameraPos cam, wop it 'works at 90 degrees', -> - cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 1, null, Math.PI / 2 + cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP expect(cam.x2y).toBeCloseTo 1 expect(cam.x2z).toBeGreaterThan 9001 expect(cam.z2y).toBeCloseTo 0 it 'works at 0 degrees', -> - cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 1, null, 0 + cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP expect(cam.x2z).toBeGreaterThan 9001 expect(cam.x2y).toBeCloseTo 1 expect(cam.z2y).toBeCloseTo 0 it 'works at 45 degrees', -> - cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 1, null, Math.PI / 4 + cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP expect(cam.x2y).toBeCloseTo 1 expect(cam.x2z).toBeGreaterThan 9001 expect(cam.z2y).toBeCloseTo 0 xit 'works at default angle of asin(0.75) ~= 48.9 degrees', -> - cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 1 + cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP angle = 1 / Math.cos angle expect(cam.angle).toBeCloseTo angle expect(cam.x2y).toBeCloseTo 1 @@ -124,7 +124,7 @@ describe 'Camera (Surface point of view)', -> expect(cam.z2y).toBeCloseTo 0 xit 'works at 2x zoom, 90 degrees', -> - cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 2, null, Math.PI / 2 + cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP checkCameraPos cam wop = x: 5, y: 2.5, z: 7 cap = cam.worldToCanvas wop @@ -144,7 +144,7 @@ describe 'Camera (Surface point of view)', -> expectPositionsEqual cap, {x: 0, y: 50} xit 'works at 2x zoom, 30 degrees', -> - cam = new Camera 100, 100, 100 * Camera.MPP, 2 * 100 * Camera.MPP, testLayer, 2, null, Math.PI / 6 + cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 2 * 100 * Camera.MPP expect(cam.x2y).toBeCloseTo 1 expect(cam.x2z).toBeGreaterThan 9001 checkCameraPos cam @@ -165,15 +165,15 @@ describe 'Camera (Surface point of view)', -> expectPositionsEqual cap, {x: 50, y: -100} it 'works at 2x zoom, 60 degree hFOV', -> - cam = new Camera 100, 100, 100 * Camera.MPP, 100 * Camera.MPP, testLayer, 2, null, null, 0.01 + cam = new Camera { attr: (x) -> 100 }, 100 * Camera.MPP, 100 * Camera.MPP checkCameraPos cam - it 'works at 2x zoom, 60 degree hFOV, 40 degree hFOV', -> - cam = new Camera 100, 63.041494, 100 * Camera.MPP, 63.041494 * Camera.MPP, testLayer, 2, null, null, Math.PI / 3 + xit 'works at 2x zoom, 60 degree hFOV, 40 degree hFOV', -> + cam = new Camera { attr: (x) -> x is 'height' ? 63.041494 : 100 }, 100 * Camera.MPP, 63.041494 * Camera.MPP checkCameraPos cam xit 'works on a surface wider than it is tall, 30 degrees, default viewing upper left corner', -> - cam = new Camera 100, 100, 200 * Camera.MPP, 2 * 50 * Camera.MPP, testLayer, 1, {x: 0, y: 0}, Math.PI / 6 + cam = new Camera { attr: (x) -> 100 }, 200 * Camera.MPP, 2 * 50 * Camera.MPP checkCameraPos cam expect(cam.zoom).toBeCloseTo 2 wop = x: 5, y: 4, z: 6 * cam.y2z # like x: 5, y: 10 out of world width: 20, height: 10 diff --git a/test/server/common.coffee b/test/server/common.coffee index d88fa21e8..dc01d8389 100644 --- a/test/server/common.coffee +++ b/test/server/common.coffee @@ -3,13 +3,19 @@ console.log 'IT BEGINS' - +require('jasmine-spec-reporter') +jasmine.getEnv().reporter.subReporters_ = [] +jasmine.getEnv().addReporter(new jasmine.SpecReporter({ + displaySuccessfulSpec: true, + displayFailedSpec: true + })) GLOBAL._ = require('lodash') _.str = require('underscore.string') _.mixin(_.str.exports()) GLOBAL.mongoose = require 'mongoose' mongoose.connect('mongodb://localhost/coco_unittest') path = require('path') +GLOBAL.testing = true models_path = [ '../../server/articles/Article' @@ -19,6 +25,7 @@ models_path = [ '../../server/levels/sessions/LevelSession' '../../server/levels/thangs/LevelThangType' '../../server/users/User' + '../../server/patches/Patch' ] for m in models_path @@ -62,13 +69,13 @@ GLOBAL.unittest = {} unittest.users = unittest.users or {} unittest.getNormalJoe = (done, force) -> - unittest.getUser('normal@jo.com', 'food', done, force) + unittest.getUser('Joe', 'normal@jo.com', 'food', done, force) unittest.getOtherSam = (done, force) -> - unittest.getUser('other@sam.com', 'beer', done, force) + unittest.getUser('Sam', 'other@sam.com', 'beer', done, force) unittest.getAdmin = (done, force) -> - unittest.getUser('admin@afc.com', '80yqxpb38j', done, force) + unittest.getUser('Admin', 'admin@afc.com', '80yqxpb38j', done, force) -unittest.getUser = (email, password, done, force) -> +unittest.getUser = (name, email, password, done, force) -> # Creates the user if it doesn't already exist. return done(unittest.users[email]) if unittest.users[email] and not force @@ -78,18 +85,15 @@ unittest.getUser = (email, password, done, force) -> req = request.post(getURL('/db/user'), (err, response, body) -> throw err if err User.findOne({email:email}).exec((err, user) -> - if password is '80yqxpb38j' - user.set('permissions', [ 'admin' ]) - user.save (err) -> - wrapUpGetUser(email, user, done) - else + user.set('permissions', if password is '80yqxpb38j' then [ 'admin' ] else []) + user.set('name', name) + user.save (err) -> wrapUpGetUser(email, user, done) ) ) form = req.form() form.append('email', email) form.append('password', password) - wrapUpGetUser = (email, user, done) -> unittest.users[email] = user diff --git a/test/server/functional/article.spec.coffee b/test/server/functional/article.spec.coffee index 377907180..a3973007b 100644 --- a/test/server/functional/article.spec.coffee +++ b/test/server/functional/article.spec.coffee @@ -84,3 +84,12 @@ describe '/db/article', -> body = JSON.parse(body) expect(body.type).toBeDefined() done() + + it 'does not allow naming an article a reserved word', (done) -> + loginAdmin -> + new_article = {name: 'Search', body:'is a reserved word'} + request.post {uri:url, json:new_article}, (err, res, body) -> + expect(res.statusCode).toBe(422) + done() + + \ No newline at end of file diff --git a/test/server/functional/auth.spec.coffee b/test/server/functional/auth.spec.coffee index 18c3c7fc8..15ef44171 100644 --- a/test/server/functional/auth.spec.coffee +++ b/test/server/functional/auth.spec.coffee @@ -1,5 +1,6 @@ require '../common' request = require 'request' +User = require '../../../server/users/User' urlLogin = getURL('/auth/login') urlReset = getURL('/auth/reset') @@ -16,7 +17,8 @@ describe '/auth/whoami', -> describe '/auth/login', -> it 'clears Users first', (done) -> - User.remove {}, (err) -> + clearModels [User], (err) -> + throw err if err request.get getURL('/auth/whoami'), -> throw err if err done() @@ -55,7 +57,7 @@ describe '/auth/login', -> it 'rejects wrong passwords', (done) -> req = request.post(urlLogin, (error, response) -> expect(response.statusCode).toBe(401) - expect(response.body.indexOf("wrong, wrong")).toBeGreaterThan(-1) + expect(response.body.indexOf("wrong")).toBeGreaterThan(-1) done() ) form = req.form() @@ -96,7 +98,6 @@ describe '/auth/reset', -> it 'resets user password', (done) -> req = request.post(urlReset, (error, response) -> expect(response).toBeDefined() - console.log 'status code is', response.statusCode expect(response.statusCode).toBe(200) expect(response.body).toBeDefined() passwordReset = response.body @@ -135,3 +136,21 @@ describe '/auth/reset', -> form = req.form() form.append('username', 'scott@gmail.com') form.append('password', 'nada') + +describe '/auth/unsubscribe', -> + it 'clears Users first', (done) -> + clearModels [User], (err) -> + throw err if err + request.get getURL('/auth/whoami'), -> + throw err if err + done() + + it 'removes just recruitment emails if you include ?recruitNotes=1', (done) -> + loginJoe (joe) -> + url = getURL('/auth/unsubscribe?recruitNotes=1&email='+joe.get('email')) + request.get url, (error, response) -> + expect(response.statusCode).toBe(200) + user = User.findOne(joe.get('_id')).exec (err, user) -> + expect(user.get('emails').recruitNotes.enabled).toBe(false) + expect(user.isEmailSubscriptionEnabled('generalNews')).toBeTruthy() + done() diff --git a/test/server/functional/file.spec.coffee b/test/server/functional/file.spec.coffee index cbabfb14e..0fb58ffd8 100644 --- a/test/server/functional/file.spec.coffee +++ b/test/server/functional/file.spec.coffee @@ -27,15 +27,6 @@ describe '/file', -> dropGridFS -> done() - it 'can\'t be created by ordinary users.', (done) -> - func = (err, res, body) -> - expect(res.statusCode).toBe(403) - expect(body.metadata).toBeUndefined() - done() - - loginJoe -> - request.post(options, func) - it 'can\'t be created if invalid (property path is required)', (done) -> func = (err, res, body) -> expect(res.statusCode).toBe(422) diff --git a/test/server/functional/level.spec.coffee b/test/server/functional/level.spec.coffee index 13dc6425a..edd163d0d 100644 --- a/test/server/functional/level.spec.coffee +++ b/test/server/functional/level.spec.coffee @@ -6,6 +6,9 @@ describe 'Level', -> name: "King's Peak 3" description: 'Climb a mountain.' permissions: simplePermissions + scripts: [] + thangs: [] + documentation: {specificArticles:[], generalArticles:[]} urlLevel = '/db/level' diff --git a/test/server/functional/level_component.spec.coffee b/test/server/functional/level_component.spec.coffee index 4850d834c..9127ccefd 100644 --- a/test/server/functional/level_component.spec.coffee +++ b/test/server/functional/level_component.spec.coffee @@ -3,11 +3,14 @@ require '../common' describe 'LevelComponent', -> component = - name:'Bashes Everything' + name:'BashesEverything' description:'Makes the unit uncontrollably bash anything bashable, using the bash system.' code: 'bash();' - language: 'javascript' + language: 'coffeescript' permissions:simplePermissions + propertyDocumentation: [] + system: 'ai' + dependencies: [] components = {} @@ -45,7 +48,7 @@ describe 'LevelComponent', -> it 'have a unique name.', (done) -> loginAdmin -> request.post {uri:url, json:component}, (err, res, body) -> - expect(res.statusCode).toBe(422) + expect(res.statusCode).toBe(409) done() it 'can be read by an admin.', (done) -> diff --git a/test/server/functional/level_system.spec.coffee b/test/server/functional/level_system.spec.coffee index 32ca61df1..229c3a39d 100644 --- a/test/server/functional/level_system.spec.coffee +++ b/test/server/functional/level_system.spec.coffee @@ -11,6 +11,8 @@ describe 'LevelSystem', -> """ language: 'coffeescript' permissions:simplePermissions + dependencies: [] + propertyDocumentation: [] systems = {} @@ -48,7 +50,7 @@ describe 'LevelSystem', -> it 'have a unique name.', (done) -> loginAdmin -> request.post {uri:url, json:system}, (err, res, body) -> - expect(res.statusCode).toBe(422) + expect(res.statusCode).toBe(409) done() it 'can be read by an admin.', (done) -> diff --git a/test/server/functional/mail.spec.coffee b/test/server/functional/mail.spec.coffee new file mode 100644 index 000000000..0910aab6f --- /dev/null +++ b/test/server/functional/mail.spec.coffee @@ -0,0 +1,38 @@ +require '../common' +mail = require '../../../server/routes/mail' +User = require '../../../server/users/User' + +testPost = + data: + email: 'scott@codecombat.com' + id: '12345678' + merges: + INTERESTS: 'Announcements, Adventurers, Archmages, Scribes, Diplomats, Ambassadors, Artisans' + FNAME: 'Scott' + LNAME: 'Erickson' + +describe 'handleProfileUpdate', -> + it 'updates emails from the data passed in', (done) -> + u = new User() + mail.handleProfileUpdate(u, testPost) + expect(u.isEmailSubscriptionEnabled('generalNews')).toBeTruthy() + expect(u.isEmailSubscriptionEnabled('adventurerNews')).toBeTruthy() + expect(u.isEmailSubscriptionEnabled('archmageNews')).toBeTruthy() + expect(u.isEmailSubscriptionEnabled('scribeNews')).toBeTruthy() + expect(u.isEmailSubscriptionEnabled('diplomatNews')).toBeTruthy() + expect(u.isEmailSubscriptionEnabled('ambassadorNews')).toBeTruthy() + expect(u.isEmailSubscriptionEnabled('artisanNews')).toBeTruthy() + done() + +describe 'handleUnsubscribe', -> + it 'turns off all news and notifications', (done) -> + u = new User({generalNews: {enabled:true}, archmageNews: {enabled:true}, anyNotes: {enabled:true}}) + mail.handleUnsubscribe(u) + expect(u.isEmailSubscriptionEnabled('generalNews')).toBeFalsy() + expect(u.isEmailSubscriptionEnabled('adventurerNews')).toBeFalsy() + expect(u.isEmailSubscriptionEnabled('archmageNews')).toBeFalsy() + expect(u.isEmailSubscriptionEnabled('scribeNews')).toBeFalsy() + expect(u.isEmailSubscriptionEnabled('diplomatNews')).toBeFalsy() + expect(u.isEmailSubscriptionEnabled('ambassadorNews')).toBeFalsy() + expect(u.isEmailSubscriptionEnabled('artisanNews')).toBeFalsy() + done() diff --git a/test/server/functional/patch.spec.coffee b/test/server/functional/patch.spec.coffee new file mode 100644 index 000000000..9d0f4265d --- /dev/null +++ b/test/server/functional/patch.spec.coffee @@ -0,0 +1,119 @@ +require '../common' + +describe '/db/patch', -> + request = require 'request' + it 'clears the db first', (done) -> + clearModels [User, Article, Patch], (err) -> + throw err if err + done() + + article = {name: 'Yo', body:'yo ma'} + articleURL = getURL('/db/article') + articles = {} + + patchURL = getURL('/db/patch') + patches = {} + patch = + commitMessage: 'Accept this patch!' + delta: {name:['test']} + editPath: '/who/knows/yes' + target: + id:null + collection: 'article' + + it 'creates an Article to patch', (done) -> + loginAdmin -> + request.post {uri:articleURL, json:article}, (err, res, body) -> + articles[0] = body + patch.target.id = articles[0]._id + done() + + it "allows someone to submit a patch to something they don't control", (done) -> + loginJoe (joe) -> + request.post {uri: patchURL, json: patch}, (err, res, body) -> + expect(res.statusCode).toBe(200) + expect(body.target.original).toBeDefined() + expect(body.target.version.major).toBeDefined() + expect(body.target.version.minor).toBeDefined() + expect(body.status).toBe('pending') + expect(body.created).toBeDefined() + expect(body.creator).toBe(joe.id) + patches[0] = body + done() + + it 'adds a patch to the target document', (done) -> + Article.findOne({}).exec (err, article) -> + expect(article.toObject().patches[0]).toBeDefined() + done() + + it 'shows up in patch requests', (done) -> + patchesURL = getURL("/db/article/#{articles[0]._id}/patches") + request.get {uri: patchesURL}, (err, res, body) -> + body = JSON.parse(body) + expect(res.statusCode).toBe(200) + expect(body.length).toBe(1) + done() + + it 'allows you to set yourself as watching', (done) -> + watchingURL = getURL("/db/article/#{articles[0]._id}/watch") + request.put {uri: watchingURL, json: {on:true}}, (err, res, body) -> + expect(body.watchers[1]).toBeDefined() + done() + + it 'added the watcher to the target document', (done) -> + Article.findOne({}).exec (err, article) -> + expect(article.toObject().watchers[1]).toBeDefined() + done() + + it 'does not add duplicate watchers', (done) -> + watchingURL = getURL("/db/article/#{articles[0]._id}/watch") + request.put {uri: watchingURL, json: {on:true}}, (err, res, body) -> + expect(body.watchers.length).toBe(2) + done() + + it 'allows removing yourself', (done) -> + watchingURL = getURL("/db/article/#{articles[0]._id}/watch") + request.put {uri: watchingURL, json: {on:false}}, (err, res, body) -> + expect(body.watchers.length).toBe(1) + done() + + it 'allows the submitter to withdraw the pull request', (done) -> + statusURL = getURL("/db/patch/#{patches[0]._id}/status") + request.put {uri: statusURL, json: {status:'withdrawn'}}, (err, res, body) -> + expect(res.statusCode).toBe(200) + Patch.findOne({}).exec (err, article) -> + expect(article.get('status')).toBe 'withdrawn' + Article.findOne({}).exec (err, article) -> + expect(article.toObject().patches.length).toBe(0) + done() + + it 'does not allow the submitter to reject or accept the pull request', (done) -> + statusURL = getURL("/db/patch/#{patches[0]._id}/status") + request.put {uri: statusURL, json: {status:'rejected'}}, (err, res, body) -> + expect(res.statusCode).toBe(403) + request.put {uri: statusURL, json: {status:'accepted'}}, (err, res, body) -> + expect(res.statusCode).toBe(403) + Patch.findOne({}).exec (err, article) -> + expect(article.get('status')).toBe 'withdrawn' + done() + + it 'allows the recipient to accept or reject the pull request', (done) -> + statusURL = getURL("/db/patch/#{patches[0]._id}/status") + loginAdmin -> + request.put {uri: statusURL, json: {status:'rejected'}}, (err, res, body) -> + expect(res.statusCode).toBe(200) + Patch.findOne({}).exec (err, article) -> + expect(article.get('status')).toBe 'rejected' + request.put {uri: statusURL, json: {status:'accepted'}}, (err, res, body) -> + expect(res.statusCode).toBe(200) + Patch.findOne({}).exec (err, article) -> + expect(article.get('status')).toBe 'accepted' + done() + + it 'does not allow the recipient to withdraw the pull request', (done) -> + statusURL = getURL("/db/patch/#{patches[0]._id}/status") + request.put {uri: statusURL, json: {status:'withdrawn'}}, (err, res, body) -> + expect(res.statusCode).toBe(403) + Patch.findOne({}).exec (err, article) -> + expect(article.get('status')).toBe 'accepted' + done() \ No newline at end of file diff --git a/test/server/functional/user.spec.coffee b/test/server/functional/user.spec.coffee index 29e1360a9..03a88242d 100644 --- a/test/server/functional/user.spec.coffee +++ b/test/server/functional/user.spec.coffee @@ -1,10 +1,63 @@ require '../common' request = require 'request' +User = require '../../../server/users/User' urlUser = '/db/user' +describe 'Server user object', -> + + it 'uses the schema defaults to fill in email preferences', (done) -> + user = new User() + expect(user.isEmailSubscriptionEnabled('generalNews')).toBeTruthy() + expect(user.isEmailSubscriptionEnabled('anyNotes')).toBeTruthy() + expect(user.isEmailSubscriptionEnabled('recruitNotes')).toBeTruthy() + expect(user.isEmailSubscriptionEnabled('archmageNews')).toBeFalsy() + done() + + it 'uses old subs if they\'re around', (done) -> + user = new User() + user.set 'emailSubscriptions', ['tester'] + expect(user.isEmailSubscriptionEnabled('adventurerNews')).toBeTruthy() + expect(user.isEmailSubscriptionEnabled('generalNews')).toBeFalsy() + done() + + it 'maintains the old subs list if it\'s around', (done) -> + user = new User() + user.set 'emailSubscriptions', ['tester'] + user.setEmailSubscription('artisanNews', true) + expect(JSON.stringify(user.get('emailSubscriptions'))).toBe(JSON.stringify(['tester','level_creator'])) + done() + +describe 'User.updateMailChimp', -> + makeMC = (callback) -> + GLOBAL.mc = + lists: + subscribe: callback + + it 'uses emails to determine what to send to MailChimp', (done) -> + makeMC (params) -> + expect(JSON.stringify(params.merge_vars.groupings[0].groups)).toBe(JSON.stringify(['Announcements'])) + done() + + user = new User({emailSubscriptions:['announcement'], email:'tester@gmail.com'}) + User.updateMailChimp(user) + describe 'POST /db/user', -> + createAnonNameUser = (done)-> + request.post getURL('/auth/logout'), -> + request.get getURL('/auth/whoami'), -> + req = request.post(getURL('/db/user'), (err, response) -> + expect(response.statusCode).toBe(200) + request.get getURL('/auth/whoami'), (request, response, body) -> + res = JSON.parse(response.body) + expect(res.anonymous).toBeTruthy() + expect(res.name).toEqual('Jim') + done() + ) + form = req.form() + form.append('name', 'Jim') + it 'preparing test : clears the db first', (done) -> clearModels [User], (err) -> throw err if err @@ -51,6 +104,36 @@ describe 'POST /db/user', -> expect(user.passwordHash).toBeUndefined() done() + it 'should allow setting anonymous user name', (done) -> + createAnonNameUser(done) + + it 'should allow multiple anonymous users with same name', (done) -> + createAnonNameUser(done) + + + it 'should not allow setting existing user name to anonymous user', (done) -> + + createAnonUser = -> + request.post getURL('/auth/logout'), -> + request.get getURL('/auth/whoami'), -> + req = request.post(getURL('/db/user'), (err, response) -> + expect(response.statusCode).toBe(409) + done() + ) + form = req.form() + form.append('name', 'Jim') + + req = request.post(getURL('/db/user'), (err,response,body) -> + expect(response.statusCode).toBe(200) + request.get getURL('/auth/whoami'), (request, response, body) -> + res = JSON.parse(response.body) + expect(res.anonymous).toBeFalsy() + createAnonUser() + ) + form = req.form() + form.append('email', 'new@user.com') + form.append('password', 'new') + describe 'PUT /db/user', -> @@ -108,11 +191,20 @@ ghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghl form.append('_id', String(admin._id)) form.append('email', joe.get('email').toUpperCase()) - it 'works', (done) -> + it 'does not care if you include your existing name', (done) -> + unittest.getNormalJoe (joe) -> + req = request.put getURL(urlUser+'/'+joe._id), (err, res) -> + expect(res.statusCode).toBe(200) + done() + form = req.form() + form.append('_id', String(joe._id)) + form.append('name', 'Joe') + + it 'accepts name and email changes', (done) -> unittest.getNormalJoe (joe) -> req = request.put getURL(urlUser), (err, res) -> expect(res.statusCode).toBe(200) - unittest.getUser('New@email.com', 'null', (joe) -> + unittest.getUser('Wilhelm', 'New@email.com', 'null', (joe) -> expect(joe.get('name')).toBe('Wilhelm') expect(joe.get('emailLower')).toBe('new@email.com') expect(joe.get('email')).toBe('New@email.com') @@ -122,7 +214,6 @@ ghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghlfarghlarghl form.append('email', 'New@email.com') form.append('name', 'Wilhelm') - describe 'GET /db/user', -> it 'logs in as admin', (done) -> diff --git a/vendor/scripts/antiscroll.js b/vendor/scripts/antiscroll.js deleted file mode 100644 index 2de1812d6..000000000 --- a/vendor/scripts/antiscroll.js +++ /dev/null @@ -1,471 +0,0 @@ -(function ($) { - - /** - * Augment jQuery prototype. - */ - - $.fn.antiscroll = function (options) { - return this.each(function () { - if ($(this).data('antiscroll')) { - $(this).data('antiscroll').destroy(); - } - - $(this).data('antiscroll', new $.Antiscroll(this, options)); - }); - }; - - /** - * Expose constructor. - */ - - $.Antiscroll = Antiscroll; - - /** - * Antiscroll pane constructor. - * - * @param {Element|jQuery} main pane - * @parma {Object} options - * @api public - */ - - function Antiscroll (el, opts) { - this.el = $(el); - this.options = opts || {}; - - this.x = (false !== this.options.x) || this.options.forceHorizontal; - this.y = (false !== this.options.y) || this.options.forceVertical; - this.autoHide = false !== this.options.autoHide; - this.padding = undefined == this.options.padding ? 2 : this.options.padding; - - this.inner = this.el.find('.antiscroll-inner'); - this.inner.css({ - 'width': '+=' + (this.y ? scrollbarSize() : 0) - , 'height': '+=' + (this.x ? scrollbarSize() : 0) - }); - - this.refresh(); - }; - - /** - * refresh scrollbars - * - * @api public - */ - - Antiscroll.prototype.refresh = function() { - var needHScroll = this.inner.get(0).scrollWidth > this.el.width() + (this.y ? scrollbarSize() : 0), - needVScroll = this.inner.get(0).scrollHeight > this.el.height() + (this.x ? scrollbarSize() : 0); - - if (this.x) { - if (!this.horizontal && needHScroll) { - this.horizontal = new Scrollbar.Horizontal(this); - } else if (this.horizontal && !needHScroll) { - this.horizontal.destroy(); - this.horizontal = null; - } else if (this.horizontal) { - this.horizontal.update(); - } - } - - if (this.y) { - if (!this.vertical && needVScroll) { - this.vertical = new Scrollbar.Vertical(this); - } else if (this.vertical && !needVScroll) { - this.vertical.destroy(); - this.vertical = null; - } else if (this.vertical) { - this.vertical.update(); - } - } - }; - - /** - * Cleans up. - * - * @return {Antiscroll} for chaining - * @api public - */ - - Antiscroll.prototype.destroy = function () { - if (this.horizontal) { - this.horizontal.destroy(); - this.horizontal = null - } - if (this.vertical) { - this.vertical.destroy(); - this.vertical = null - } - return this; - }; - - /** - * Rebuild Antiscroll. - * - * @return {Antiscroll} for chaining - * @api public - */ - - Antiscroll.prototype.rebuild = function () { - this.destroy(); - this.inner.attr('style', ''); - Antiscroll.call(this, this.el, this.options); - return this; - }; - - /** - * Scrollbar constructor. - * - * @param {Element|jQuery} element - * @api public - */ - - function Scrollbar (pane) { - this.pane = pane; - this.pane.el.append(this.el); - this.innerEl = this.pane.inner.get(0); - - this.dragging = false; - this.enter = false; - this.shown = false; - - // hovering - this.pane.el.mouseenter($.proxy(this, 'mouseenter')); - this.pane.el.mouseleave($.proxy(this, 'mouseleave')); - - // dragging - this.el.mousedown($.proxy(this, 'mousedown')); - - // scrolling - this.innerPaneScrollListener = $.proxy(this, 'scroll'); - this.pane.inner.scroll(this.innerPaneScrollListener); - - // wheel -optional- - this.innerPaneMouseWheelListener = $.proxy(this, 'mousewheel'); - this.pane.inner.bind('mousewheel', this.innerPaneMouseWheelListener); - - // show - var initialDisplay = this.pane.options.initialDisplay; - - if (initialDisplay !== false) { - this.show(); - if (this.pane.autoHide) { - this.hiding = setTimeout($.proxy(this, 'hide'), parseInt(initialDisplay, 10) || 3000); - } - } - }; - - /** - * Cleans up. - * - * @return {Scrollbar} for chaining - * @api public - */ - - Scrollbar.prototype.destroy = function () { - this.el.remove(); - this.pane.inner.unbind('scroll', this.innerPaneScrollListener); - this.pane.inner.unbind('mousewheel', this.innerPaneMouseWheelListener); - return this; - }; - - /** - * Called upon mouseenter. - * - * @api private - */ - - Scrollbar.prototype.mouseenter = function () { - this.enter = true; - this.show(); - }; - - /** - * Called upon mouseleave. - * - * @api private - */ - - Scrollbar.prototype.mouseleave = function () { - this.enter = false; - - if (!this.dragging) { - if (this.pane.autoHide) { - this.hide(); - } - } - }; - - /** - * Called upon wrap scroll. - * - * @api private - */ - - Scrollbar.prototype.scroll = function () { - if (!this.shown) { - this.show(); - if (!this.enter && !this.dragging) { - if (this.pane.autoHide) { - this.hiding = setTimeout($.proxy(this, 'hide'), 1500); - } - } - } - - this.update(); - }; - - /** - * Called upon scrollbar mousedown. - * - * @api private - */ - - Scrollbar.prototype.mousedown = function (ev) { - ev.preventDefault(); - - this.dragging = true; - - this.startPageY = ev.pageY - parseInt(this.el.css('top'), 10); - this.startPageX = ev.pageX - parseInt(this.el.css('left'), 10); - - // prevent crazy selections on IE - this.el[0].ownerDocument.onselectstart = function () { return false; }; - - var pane = this.pane, - move = $.proxy(this, 'mousemove'), - self = this - - $(this.el[0].ownerDocument) - .mousemove(move) - .mouseup(function () { - self.dragging = false; - this.onselectstart = null; - - $(this).unbind('mousemove', move); - - if (!self.enter) { - self.hide(); - } - }); - }; - - /** - * Show scrollbar. - * - * @api private - */ - - Scrollbar.prototype.show = function (duration) { - if (!this.shown && this.update()) { - this.el.addClass('antiscroll-scrollbar-shown'); - if (this.hiding) { - clearTimeout(this.hiding); - this.hiding = null; - } - this.shown = true; - } - }; - - /** - * Hide scrollbar. - * - * @api private - */ - - Scrollbar.prototype.hide = function () { - if (this.pane.autoHide !== false && this.shown) { - // check for dragging - this.el.removeClass('antiscroll-scrollbar-shown'); - this.shown = false; - } - }; - - /** - * Horizontal scrollbar constructor - * - * @api private - */ - - Scrollbar.Horizontal = function (pane) { - this.el = $('', pane.el); - Scrollbar.call(this, pane); - }; - - /** - * Inherits from Scrollbar. - */ - - inherits(Scrollbar.Horizontal, Scrollbar); - - /** - * Updates size/position of scrollbar. - * - * @api private - */ - - Scrollbar.Horizontal.prototype.update = function () { - var paneWidth = this.pane.el.width(), - trackWidth = paneWidth - this.pane.padding * 2, - innerEl = this.pane.inner.get(0) - - this.el - .css('width', trackWidth * paneWidth / innerEl.scrollWidth) - .css('left', trackWidth * innerEl.scrollLeft / innerEl.scrollWidth); - - return paneWidth < innerEl.scrollWidth; - }; - - /** - * Called upon drag. - * - * @api private - */ - - Scrollbar.Horizontal.prototype.mousemove = function (ev) { - var trackWidth = this.pane.el.width() - this.pane.padding * 2, - pos = ev.pageX - this.startPageX, - barWidth = this.el.width(), - innerEl = this.pane.inner.get(0) - - // minimum top is 0, maximum is the track height - var y = Math.min(Math.max(pos, 0), trackWidth - barWidth); - - innerEl.scrollLeft = (innerEl.scrollWidth - this.pane.el.width()) - * y / (trackWidth - barWidth); - }; - - /** - * Called upon container mousewheel. - * - * @api private - */ - - Scrollbar.Horizontal.prototype.mousewheel = function (ev, delta, x, y) { - if ((x < 0 && 0 == this.pane.inner.get(0).scrollLeft) || - (x > 0 && (this.innerEl.scrollLeft + Math.ceil(this.pane.el.width()) - == this.innerEl.scrollWidth))) { - ev.preventDefault(); - return false; - } - }; - - /** - * Vertical scrollbar constructor - * - * @api private - */ - - Scrollbar.Vertical = function (pane) { - this.el = $('', pane.el); - Scrollbar.call(this, pane); - }; - - /** - * Inherits from Scrollbar. - */ - - inherits(Scrollbar.Vertical, Scrollbar); - - /** - * Updates size/position of scrollbar. - * - * @api private - */ - - Scrollbar.Vertical.prototype.update = function () { - var paneHeight = this.pane.el.height(), - trackHeight = paneHeight - this.pane.padding * 2, - innerEl = this.innerEl; - - var scrollbarHeight = trackHeight * paneHeight / innerEl.scrollHeight; - scrollbarHeight = scrollbarHeight < 20 ? 20 : scrollbarHeight; - - var topPos = trackHeight * innerEl.scrollTop / innerEl.scrollHeight; - - if((topPos + scrollbarHeight) > trackHeight) { - var diff = (topPos + scrollbarHeight) - trackHeight; - topPos = topPos - diff - 3; - } - - this.el - .css('height', scrollbarHeight) - .css('top', topPos); - - return paneHeight < innerEl.scrollHeight; - }; - - /** - * Called upon drag. - * - * @api private - */ - - Scrollbar.Vertical.prototype.mousemove = function (ev) { - var paneHeight = this.pane.el.height(), - trackHeight = paneHeight - this.pane.padding * 2, - pos = ev.pageY - this.startPageY, - barHeight = this.el.height(), - innerEl = this.innerEl - - // minimum top is 0, maximum is the track height - var y = Math.min(Math.max(pos, 0), trackHeight - barHeight); - - innerEl.scrollTop = (innerEl.scrollHeight - paneHeight) - * y / (trackHeight - barHeight); - }; - - /** - * Called upon container mousewheel. - * - * @api private - */ - - Scrollbar.Vertical.prototype.mousewheel = function (ev, delta, x, y) { - if ((y > 0 && 0 == this.innerEl.scrollTop) || - (y < 0 && (this.innerEl.scrollTop + Math.ceil(this.pane.el.height()) - == this.innerEl.scrollHeight))) { - ev.preventDefault(); - return false; - } - }; - - /** - * Cross-browser inheritance. - * - * @param {Function} constructor - * @param {Function} constructor we inherit from - * @api private - */ - - function inherits (ctorA, ctorB) { - function f() {}; - f.prototype = ctorB.prototype; - ctorA.prototype = new f; - }; - - /** - * Scrollbar size detection. - */ - - var size; - - function scrollbarSize () { - if (size === undefined) { - var div = $( - '
'
- + '
'
- );
-
- $('body').append(div);
- var w1 = $(div).innerWidth();
- var w2 = $('div', div).innerWidth();
- $(div).remove();
-
- size = w1 - w2;
- }
-
- return size;
- };
-
-})(jQuery);
diff --git a/vendor/scripts/async.js b/vendor/scripts/async.js
new file mode 100644
index 000000000..2bb5395db
--- /dev/null
+++ b/vendor/scripts/async.js
@@ -0,0 +1,1043 @@
+/*jshint onevar: false, indent:4 */
+/*global setImmediate: false, setTimeout: false, console: false */
+(function () {
+
+ var async = {};
+
+ // global on the server, window in the browser
+ var root, previous_async;
+
+ root = this;
+ if (root != null) {
+ previous_async = root.async;
+ }
+
+ async.noConflict = function () {
+ root.async = previous_async;
+ return async;
+ };
+
+ function only_once(fn) {
+ var called = false;
+ return function() {
+ if (called) throw new Error("Callback was already called.");
+ called = true;
+ fn.apply(root, arguments);
+ }
+ }
+
+ //// cross-browser compatiblity functions ////
+
+ var _toString = Object.prototype.toString;
+
+ var _isArray = Array.isArray || function (obj) {
+ return _toString.call(obj) === '[object Array]';
+ };
+
+ var _each = function (arr, iterator) {
+ if (arr.forEach) {
+ return arr.forEach(iterator);
+ }
+ for (var i = 0; i < arr.length; i += 1) {
+ iterator(arr[i], i, arr);
+ }
+ };
+
+ var _map = function (arr, iterator) {
+ if (arr.map) {
+ return arr.map(iterator);
+ }
+ var results = [];
+ _each(arr, function (x, i, a) {
+ results.push(iterator(x, i, a));
+ });
+ return results;
+ };
+
+ var _reduce = function (arr, iterator, memo) {
+ if (arr.reduce) {
+ return arr.reduce(iterator, memo);
+ }
+ _each(arr, function (x, i, a) {
+ memo = iterator(memo, x, i, a);
+ });
+ return memo;
+ };
+
+ var _keys = function (obj) {
+ if (Object.keys) {
+ return Object.keys(obj);
+ }
+ var keys = [];
+ for (var k in obj) {
+ if (obj.hasOwnProperty(k)) {
+ keys.push(k);
+ }
+ }
+ return keys;
+ };
+
+ //// exported async module functions ////
+
+ //// nextTick implementation with browser-compatible fallback ////
+ if (typeof process === 'undefined' || !(process.nextTick)) {
+ if (typeof setImmediate === 'function') {
+ async.nextTick = function (fn) {
+ // not a direct alias for IE10 compatibility
+ setImmediate(fn);
+ };
+ async.setImmediate = async.nextTick;
+ }
+ else {
+ async.nextTick = function (fn) {
+ setTimeout(fn, 0);
+ };
+ async.setImmediate = async.nextTick;
+ }
+ }
+ else {
+ async.nextTick = process.nextTick;
+ if (typeof setImmediate !== 'undefined') {
+ async.setImmediate = function (fn) {
+ // not a direct alias for IE10 compatibility
+ setImmediate(fn);
+ };
+ }
+ else {
+ async.setImmediate = async.nextTick;
+ }
+ }
+
+ async.each = function (arr, iterator, callback) {
+ callback = callback || function () {};
+ if (!arr.length) {
+ return callback();
+ }
+ var completed = 0;
+ _each(arr, function (x) {
+ iterator(x, only_once(done) );
+ });
+ function done(err) {
+ if (err) {
+ callback(err);
+ callback = function () {};
+ }
+ else {
+ completed += 1;
+ if (completed >= arr.length) {
+ callback();
+ }
+ }
+ }
+ };
+ async.forEach = async.each;
+
+ async.eachSeries = function (arr, iterator, callback) {
+ callback = callback || function () {};
+ if (!arr.length) {
+ return callback();
+ }
+ var completed = 0;
+ var iterate = function () {
+ iterator(arr[completed], function (err) {
+ if (err) {
+ callback(err);
+ callback = function () {};
+ }
+ else {
+ completed += 1;
+ if (completed >= arr.length) {
+ callback();
+ }
+ else {
+ iterate();
+ }
+ }
+ });
+ };
+ iterate();
+ };
+ async.forEachSeries = async.eachSeries;
+
+ async.eachLimit = function (arr, limit, iterator, callback) {
+ var fn = _eachLimit(limit);
+ fn.apply(null, [arr, iterator, callback]);
+ };
+ async.forEachLimit = async.eachLimit;
+
+ var _eachLimit = function (limit) {
+
+ return function (arr, iterator, callback) {
+ callback = callback || function () {};
+ if (!arr.length || limit <= 0) {
+ return callback();
+ }
+ var completed = 0;
+ var started = 0;
+ var running = 0;
+
+ (function replenish () {
+ if (completed >= arr.length) {
+ return callback();
+ }
+
+ while (running < limit && started < arr.length) {
+ started += 1;
+ running += 1;
+ iterator(arr[started - 1], function (err) {
+ if (err) {
+ callback(err);
+ callback = function () {};
+ }
+ else {
+ completed += 1;
+ running -= 1;
+ if (completed >= arr.length) {
+ callback();
+ }
+ else {
+ replenish();
+ }
+ }
+ });
+ }
+ })();
+ };
+ };
+
+
+ var doParallel = function (fn) {
+ return function () {
+ var args = Array.prototype.slice.call(arguments);
+ return fn.apply(null, [async.each].concat(args));
+ };
+ };
+ var doParallelLimit = function(limit, fn) {
+ return function () {
+ var args = Array.prototype.slice.call(arguments);
+ return fn.apply(null, [_eachLimit(limit)].concat(args));
+ };
+ };
+ var doSeries = function (fn) {
+ return function () {
+ var args = Array.prototype.slice.call(arguments);
+ return fn.apply(null, [async.eachSeries].concat(args));
+ };
+ };
+
+
+ var _asyncMap = function (eachfn, arr, iterator, callback) {
+ var results = [];
+ arr = _map(arr, function (x, i) {
+ return {index: i, value: x};
+ });
+ eachfn(arr, function (x, callback) {
+ iterator(x.value, function (err, v) {
+ results[x.index] = v;
+ callback(err);
+ });
+ }, function (err) {
+ callback(err, results);
+ });
+ };
+ async.map = doParallel(_asyncMap);
+ async.mapSeries = doSeries(_asyncMap);
+ async.mapLimit = function (arr, limit, iterator, callback) {
+ return _mapLimit(limit)(arr, iterator, callback);
+ };
+
+ var _mapLimit = function(limit) {
+ return doParallelLimit(limit, _asyncMap);
+ };
+
+ // reduce only has a series version, as doing reduce in parallel won't
+ // work in many situations.
+ async.reduce = function (arr, memo, iterator, callback) {
+ async.eachSeries(arr, function (x, callback) {
+ iterator(memo, x, function (err, v) {
+ memo = v;
+ callback(err);
+ });
+ }, function (err) {
+ callback(err, memo);
+ });
+ };
+ // inject alias
+ async.inject = async.reduce;
+ // foldl alias
+ async.foldl = async.reduce;
+
+ async.reduceRight = function (arr, memo, iterator, callback) {
+ var reversed = _map(arr, function (x) {
+ return x;
+ }).reverse();
+ async.reduce(reversed, memo, iterator, callback);
+ };
+ // foldr alias
+ async.foldr = async.reduceRight;
+
+ var _filter = function (eachfn, arr, iterator, callback) {
+ var results = [];
+ arr = _map(arr, function (x, i) {
+ return {index: i, value: x};
+ });
+ eachfn(arr, function (x, callback) {
+ iterator(x.value, function (v) {
+ if (v) {
+ results.push(x);
+ }
+ callback();
+ });
+ }, function (err) {
+ callback(_map(results.sort(function (a, b) {
+ return a.index - b.index;
+ }), function (x) {
+ return x.value;
+ }));
+ });
+ };
+ async.filter = doParallel(_filter);
+ async.filterSeries = doSeries(_filter);
+ // select alias
+ async.select = async.filter;
+ async.selectSeries = async.filterSeries;
+
+ var _reject = function (eachfn, arr, iterator, callback) {
+ var results = [];
+ arr = _map(arr, function (x, i) {
+ return {index: i, value: x};
+ });
+ eachfn(arr, function (x, callback) {
+ iterator(x.value, function (v) {
+ if (!v) {
+ results.push(x);
+ }
+ callback();
+ });
+ }, function (err) {
+ callback(_map(results.sort(function (a, b) {
+ return a.index - b.index;
+ }), function (x) {
+ return x.value;
+ }));
+ });
+ };
+ async.reject = doParallel(_reject);
+ async.rejectSeries = doSeries(_reject);
+
+ var _detect = function (eachfn, arr, iterator, main_callback) {
+ eachfn(arr, function (x, callback) {
+ iterator(x, function (result) {
+ if (result) {
+ main_callback(x);
+ main_callback = function () {};
+ }
+ else {
+ callback();
+ }
+ });
+ }, function (err) {
+ main_callback();
+ });
+ };
+ async.detect = doParallel(_detect);
+ async.detectSeries = doSeries(_detect);
+
+ async.some = function (arr, iterator, main_callback) {
+ async.each(arr, function (x, callback) {
+ iterator(x, function (v) {
+ if (v) {
+ main_callback(true);
+ main_callback = function () {};
+ }
+ callback();
+ });
+ }, function (err) {
+ main_callback(false);
+ });
+ };
+ // any alias
+ async.any = async.some;
+
+ async.every = function (arr, iterator, main_callback) {
+ async.each(arr, function (x, callback) {
+ iterator(x, function (v) {
+ if (!v) {
+ main_callback(false);
+ main_callback = function () {};
+ }
+ callback();
+ });
+ }, function (err) {
+ main_callback(true);
+ });
+ };
+ // all alias
+ async.all = async.every;
+
+ async.sortBy = function (arr, iterator, callback) {
+ async.map(arr, function (x, callback) {
+ iterator(x, function (err, criteria) {
+ if (err) {
+ callback(err);
+ }
+ else {
+ callback(null, {value: x, criteria: criteria});
+ }
+ });
+ }, function (err, results) {
+ if (err) {
+ return callback(err);
+ }
+ else {
+ var fn = function (left, right) {
+ var a = left.criteria, b = right.criteria;
+ return a < b ? -1 : a > b ? 1 : 0;
+ };
+ callback(null, _map(results.sort(fn), function (x) {
+ return x.value;
+ }));
+ }
+ });
+ };
+
+ async.auto = function (tasks, callback) {
+ callback = callback || function () {};
+ var keys = _keys(tasks);
+ var remainingTasks = keys.length
+ if (!remainingTasks) {
+ return callback();
+ }
+
+ var results = {};
+
+ var listeners = [];
+ var addListener = function (fn) {
+ listeners.unshift(fn);
+ };
+ var removeListener = function (fn) {
+ for (var i = 0; i < listeners.length; i += 1) {
+ if (listeners[i] === fn) {
+ listeners.splice(i, 1);
+ return;
+ }
+ }
+ };
+ var taskComplete = function () {
+ remainingTasks--
+ _each(listeners.slice(0), function (fn) {
+ fn();
+ });
+ };
+
+ addListener(function () {
+ if (!remainingTasks) {
+ var theCallback = callback;
+ // prevent final callback from calling itself if it errors
+ callback = function () {};
+
+ theCallback(null, results);
+ }
+ });
+
+ _each(keys, function (k) {
+ var task = _isArray(tasks[k]) ? tasks[k]: [tasks[k]];
+ var taskCallback = function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
+ if (err) {
+ var safeResults = {};
+ _each(_keys(results), function(rkey) {
+ safeResults[rkey] = results[rkey];
+ });
+ safeResults[k] = args;
+ callback(err, safeResults);
+ // stop subsequent errors hitting callback multiple times
+ callback = function () {};
+ }
+ else {
+ results[k] = args;
+ async.setImmediate(taskComplete);
+ }
+ };
+ var requires = task.slice(0, Math.abs(task.length - 1)) || [];
+ var ready = function () {
+ return _reduce(requires, function (a, x) {
+ return (a && results.hasOwnProperty(x));
+ }, true) && !results.hasOwnProperty(k);
+ };
+ if (ready()) {
+ task[task.length - 1](taskCallback, results);
+ }
+ else {
+ var listener = function () {
+ if (ready()) {
+ removeListener(listener);
+ task[task.length - 1](taskCallback, results);
+ }
+ };
+ addListener(listener);
+ }
+ });
+ };
+
+ async.retry = function(times, task, callback) {
+ var DEFAULT_TIMES = 5;
+ var attempts = [];
+ // Use defaults if times not passed
+ if (typeof times === 'function') {
+ callback = task;
+ task = times;
+ times = DEFAULT_TIMES;
+ }
+ // Make sure times is a number
+ times = parseInt(times, 10) || DEFAULT_TIMES;
+ var wrappedTask = function(wrappedCallback, wrappedResults) {
+ var retryAttempt = function(task, finalAttempt) {
+ return function(seriesCallback) {
+ task(function(err, result){
+ seriesCallback(!err || finalAttempt, {err: err, result: result});
+ }, wrappedResults);
+ };
+ };
+ while (times) {
+ attempts.push(retryAttempt(task, !(times-=1)));
+ }
+ async.series(attempts, function(done, data){
+ data = data[data.length - 1];
+ (wrappedCallback || callback)(data.err, data.result);
+ });
+ }
+ // If a callback is passed, run this as a controll flow
+ return callback ? wrappedTask() : wrappedTask
+ };
+
+ async.waterfall = function (tasks, callback) {
+ callback = callback || function () {};
+ if (!_isArray(tasks)) {
+ var err = new Error('First argument to waterfall must be an array of functions');
+ return callback(err);
+ }
+ if (!tasks.length) {
+ return callback();
+ }
+ var wrapIterator = function (iterator) {
+ return function (err) {
+ if (err) {
+ callback.apply(null, arguments);
+ callback = function () {};
+ }
+ else {
+ var args = Array.prototype.slice.call(arguments, 1);
+ var next = iterator.next();
+ if (next) {
+ args.push(wrapIterator(next));
+ }
+ else {
+ args.push(callback);
+ }
+ async.setImmediate(function () {
+ iterator.apply(null, args);
+ });
+ }
+ };
+ };
+ wrapIterator(async.iterator(tasks))();
+ };
+
+ var _parallel = function(eachfn, tasks, callback) {
+ callback = callback || function () {};
+ if (_isArray(tasks)) {
+ eachfn.map(tasks, function (fn, callback) {
+ if (fn) {
+ fn(function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
+ callback.call(null, err, args);
+ });
+ }
+ }, callback);
+ }
+ else {
+ var results = {};
+ eachfn.each(_keys(tasks), function (k, callback) {
+ tasks[k](function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
+ results[k] = args;
+ callback(err);
+ });
+ }, function (err) {
+ callback(err, results);
+ });
+ }
+ };
+
+ async.parallel = function (tasks, callback) {
+ _parallel({ map: async.map, each: async.each }, tasks, callback);
+ };
+
+ async.parallelLimit = function(tasks, limit, callback) {
+ _parallel({ map: _mapLimit(limit), each: _eachLimit(limit) }, tasks, callback);
+ };
+
+ async.series = function (tasks, callback) {
+ callback = callback || function () {};
+ if (_isArray(tasks)) {
+ async.mapSeries(tasks, function (fn, callback) {
+ if (fn) {
+ fn(function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
+ callback.call(null, err, args);
+ });
+ }
+ }, callback);
+ }
+ else {
+ var results = {};
+ async.eachSeries(_keys(tasks), function (k, callback) {
+ tasks[k](function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
+ results[k] = args;
+ callback(err);
+ });
+ }, function (err) {
+ callback(err, results);
+ });
+ }
+ };
+
+ async.iterator = function (tasks) {
+ var makeCallback = function (index) {
+ var fn = function () {
+ if (tasks.length) {
+ tasks[index].apply(null, arguments);
+ }
+ return fn.next();
+ };
+ fn.next = function () {
+ return (index < tasks.length - 1) ? makeCallback(index + 1): null;
+ };
+ return fn;
+ };
+ return makeCallback(0);
+ };
+
+ async.apply = function (fn) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ return function () {
+ return fn.apply(
+ null, args.concat(Array.prototype.slice.call(arguments))
+ );
+ };
+ };
+
+ var _concat = function (eachfn, arr, fn, callback) {
+ var r = [];
+ eachfn(arr, function (x, cb) {
+ fn(x, function (err, y) {
+ r = r.concat(y || []);
+ cb(err);
+ });
+ }, function (err) {
+ callback(err, r);
+ });
+ };
+ async.concat = doParallel(_concat);
+ async.concatSeries = doSeries(_concat);
+
+ async.whilst = function (test, iterator, callback) {
+ if (test()) {
+ iterator(function (err) {
+ if (err) {
+ return callback(err);
+ }
+ async.whilst(test, iterator, callback);
+ });
+ }
+ else {
+ callback();
+ }
+ };
+
+ async.doWhilst = function (iterator, test, callback) {
+ iterator(function (err) {
+ if (err) {
+ return callback(err);
+ }
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (test.apply(null, args)) {
+ async.doWhilst(iterator, test, callback);
+ }
+ else {
+ callback();
+ }
+ });
+ };
+
+ async.until = function (test, iterator, callback) {
+ if (!test()) {
+ iterator(function (err) {
+ if (err) {
+ return callback(err);
+ }
+ async.until(test, iterator, callback);
+ });
+ }
+ else {
+ callback();
+ }
+ };
+
+ async.doUntil = function (iterator, test, callback) {
+ iterator(function (err) {
+ if (err) {
+ return callback(err);
+ }
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (!test.apply(null, args)) {
+ async.doUntil(iterator, test, callback);
+ }
+ else {
+ callback();
+ }
+ });
+ };
+
+ async.queue = function (worker, concurrency) {
+ if (concurrency === undefined) {
+ concurrency = 1;
+ }
+ function _insert(q, data, pos, callback) {
+ if (!q.started){
+ q.started = true;
+ }
+ if (!_isArray(data)) {
+ data = [data];
+ }
+ if(data.length == 0) {
+ // call drain immediately if there are no tasks
+ return async.setImmediate(function() {
+ if (q.drain) {
+ q.drain();
+ }
+ });
+ }
+ _each(data, function(task) {
+ var item = {
+ data: task,
+ callback: typeof callback === 'function' ? callback : null
+ };
+
+ if (pos) {
+ q.tasks.unshift(item);
+ } else {
+ q.tasks.push(item);
+ }
+
+ if (q.saturated && q.tasks.length === q.concurrency) {
+ q.saturated();
+ }
+ async.setImmediate(q.process);
+ });
+ }
+
+ var workers = 0;
+ var q = {
+ tasks: [],
+ concurrency: concurrency,
+ saturated: null,
+ empty: null,
+ drain: null,
+ started: false,
+ paused: false,
+ push: function (data, callback) {
+ _insert(q, data, false, callback);
+ },
+ kill: function () {
+ q.drain = null;
+ q.tasks = [];
+ },
+ unshift: function (data, callback) {
+ _insert(q, data, true, callback);
+ },
+ process: function () {
+ if (!q.paused && workers < q.concurrency && q.tasks.length) {
+ var task = q.tasks.shift();
+ if (q.empty && q.tasks.length === 0) {
+ q.empty();
+ }
+ workers += 1;
+ var next = function () {
+ workers -= 1;
+ if (task.callback) {
+ task.callback.apply(task, arguments);
+ }
+ if (q.drain && q.tasks.length + workers === 0) {
+ q.drain();
+ }
+ q.process();
+ };
+ var cb = only_once(next);
+ worker(task.data, cb);
+ }
+ },
+ length: function () {
+ return q.tasks.length;
+ },
+ running: function () {
+ return workers;
+ },
+ idle: function() {
+ return q.tasks.length + workers === 0;
+ },
+ pause: function () {
+ if (q.paused === true) { return; }
+ q.paused = true;
+ q.process();
+ },
+ resume: function () {
+ if (q.paused === false) { return; }
+ q.paused = false;
+ q.process();
+ }
+ };
+ return q;
+ };
+
+ async.cargo = function (worker, payload) {
+ var working = false,
+ tasks = [];
+
+ var cargo = {
+ tasks: tasks,
+ payload: payload,
+ saturated: null,
+ empty: null,
+ drain: null,
+ drained: true,
+ push: function (data, callback) {
+ if (!_isArray(data)) {
+ data = [data];
+ }
+ _each(data, function(task) {
+ tasks.push({
+ data: task,
+ callback: typeof callback === 'function' ? callback : null
+ });
+ cargo.drained = false;
+ if (cargo.saturated && tasks.length === payload) {
+ cargo.saturated();
+ }
+ });
+ async.setImmediate(cargo.process);
+ },
+ process: function process() {
+ if (working) return;
+ if (tasks.length === 0) {
+ if(cargo.drain && !cargo.drained) cargo.drain();
+ cargo.drained = true;
+ return;
+ }
+
+ var ts = typeof payload === 'number'
+ ? tasks.splice(0, payload)
+ : tasks.splice(0, tasks.length);
+
+ var ds = _map(ts, function (task) {
+ return task.data;
+ });
+
+ if(cargo.empty) cargo.empty();
+ working = true;
+ worker(ds, function () {
+ working = false;
+
+ var args = arguments;
+ _each(ts, function (data) {
+ if (data.callback) {
+ data.callback.apply(null, args);
+ }
+ });
+
+ process();
+ });
+ },
+ length: function () {
+ return tasks.length;
+ },
+ running: function () {
+ return working;
+ }
+ };
+ return cargo;
+ };
+
+ var _console_fn = function (name) {
+ return function (fn) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ fn.apply(null, args.concat([function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (typeof console !== 'undefined') {
+ if (err) {
+ if (console.error) {
+ console.error(err);
+ }
+ }
+ else if (console[name]) {
+ _each(args, function (x) {
+ console[name](x);
+ });
+ }
+ }
+ }]));
+ };
+ };
+ async.log = _console_fn('log');
+ async.dir = _console_fn('dir');
+ /*async.info = _console_fn('info');
+ async.warn = _console_fn('warn');
+ async.error = _console_fn('error');*/
+
+ async.memoize = function (fn, hasher) {
+ var memo = {};
+ var queues = {};
+ hasher = hasher || function (x) {
+ return x;
+ };
+ var memoized = function () {
+ var args = Array.prototype.slice.call(arguments);
+ var callback = args.pop();
+ var key = hasher.apply(null, args);
+ if (key in memo) {
+ async.nextTick(function () {
+ callback.apply(null, memo[key]);
+ });
+ }
+ else if (key in queues) {
+ queues[key].push(callback);
+ }
+ else {
+ queues[key] = [callback];
+ fn.apply(null, args.concat([function () {
+ memo[key] = arguments;
+ var q = queues[key];
+ delete queues[key];
+ for (var i = 0, l = q.length; i < l; i++) {
+ q[i].apply(null, arguments);
+ }
+ }]));
+ }
+ };
+ memoized.memo = memo;
+ memoized.unmemoized = fn;
+ return memoized;
+ };
+
+ async.unmemoize = function (fn) {
+ return function () {
+ return (fn.unmemoized || fn).apply(null, arguments);
+ };
+ };
+
+ async.times = function (count, iterator, callback) {
+ var counter = [];
+ for (var i = 0; i < count; i++) {
+ counter.push(i);
+ }
+ return async.map(counter, iterator, callback);
+ };
+
+ async.timesSeries = function (count, iterator, callback) {
+ var counter = [];
+ for (var i = 0; i < count; i++) {
+ counter.push(i);
+ }
+ return async.mapSeries(counter, iterator, callback);
+ };
+
+ async.seq = function (/* functions... */) {
+ var fns = arguments;
+ return function () {
+ var that = this;
+ var args = Array.prototype.slice.call(arguments);
+ var callback = args.pop();
+ async.reduce(fns, args, function (newargs, fn, cb) {
+ fn.apply(that, newargs.concat([function () {
+ var err = arguments[0];
+ var nextargs = Array.prototype.slice.call(arguments, 1);
+ cb(err, nextargs);
+ }]))
+ },
+ function (err, results) {
+ callback.apply(that, [err].concat(results));
+ });
+ };
+ };
+
+ async.compose = function (/* functions... */) {
+ return async.seq.apply(null, Array.prototype.reverse.call(arguments));
+ };
+
+ var _applyEach = function (eachfn, fns /*args...*/) {
+ var go = function () {
+ var that = this;
+ var args = Array.prototype.slice.call(arguments);
+ var callback = args.pop();
+ return eachfn(fns, function (fn, cb) {
+ fn.apply(that, args.concat([cb]));
+ },
+ callback);
+ };
+ if (arguments.length > 2) {
+ var args = Array.prototype.slice.call(arguments, 2);
+ return go.apply(this, args);
+ }
+ else {
+ return go;
+ }
+ };
+ async.applyEach = doParallel(_applyEach);
+ async.applyEachSeries = doSeries(_applyEach);
+
+ async.forever = function (fn, callback) {
+ function next(err) {
+ if (err) {
+ if (callback) {
+ return callback(err);
+ }
+ throw err;
+ }
+ fn(next);
+ }
+ next();
+ };
+
+ // Node.js
+ if (typeof module !== 'undefined' && module.exports) {
+ module.exports = async;
+ }
+ // AMD / RequireJS
+ else if (typeof define !== 'undefined' && define.amd) {
+ define([], function () {
+ return async;
+ });
+ }
+ // included directly via