DTL (Test > Levelbuilder): 6462e608

Gemfile

@@ -111,6 +111,7 @@ gem 'factory_girl_rails', group: [:development, :staging, :test, :adhoc]
 # For pegasus PDF generation.
 gem 'open_uri_redirections', require: false, group: [:development, :staging, :test]
 
+gem 'gctools'
 gem 'unicorn', '~> 5.1.0'
 
 gem 'chronic', '~> 0.10.2'

Gemfile.lock

@@ -319,6 +319,7 @@ GEM
     font-awesome-rails (4.6.3.1)
       railties (>= 3.2, < 5.1)
     fspath (3.1.0)
+    gctools (0.2.4)
     gemoji (2.1.0)
     gherkin (4.0.0)
     globalid (0.3.7)
@@ -781,6 +782,7 @@ DEPENDENCIES
   firebase_token_generator
   font-awesome-rails (~> 4.6.3)
   full-name-splitter!
+  gctools
   gemoji
   geocoder!
   google-api-client

apps/src/craft/agent/craft.js

@@ -479,8 +479,8 @@ export default class Craft {
       actionPlane: levelConfig.actionPlane,
       fluffPlane: fluffPlane,
       entities: levelConfig.entities,
-      useAgent: true,
-      usePlayer: true,
+      useAgent: !!levelConfig.agentStartPosition,
+      usePlayer: !!levelConfig.playerStartPosition,
       playerStartPosition: levelConfig.playerStartPosition,
       playerStartDirection: levelConfig.playerStartDirection,
       agentStartPosition: levelConfig.agentStartPosition,

apps/src/maze/CollectorGemCounter.jsx

@@ -13,10 +13,16 @@ const styles = {
     pointerEvents: 'none',
     textAlign: 'right',
     verticalAlign: 'top',
+    marginTop: 5,
   },
   label: {
-    color: color.lighter_gray,
-    textTransform: 'capitalize'
+    color: color.white,
+    textTransform: 'capitalize',
+    backgroundColor: color.charcoal,
+    textAlign: 'center',
+    fontSize: 14,
+    borderRadius: 2,
+    width: '100%',
   },
   hr: {
     borderColor: color.lighter_gray,
@@ -25,7 +31,8 @@ const styles = {
   },
   gemImage: {
     backgroundImage: `url("${assetUrl('media/skins/collector/gem.png')}")`,
-    backgroundSize: '100%',
+    backgroundSize: '120%',
+    backgroundPosition: 'center',
     display: 'inline',
     padding: 5
   },
@@ -37,6 +44,11 @@ const styles = {
     position: 'relative',
     top: 7,
   },
+  gemCount: {
+    paddingRight: 5,
+    fontSize: 17,
+    color: color.charcoal,
+  },
 };
 
 export class CollectorGemCounter extends React.Component {
@@ -54,21 +66,20 @@ export class CollectorGemCounter extends React.Component {
 
     return (
       <div style={styles.container}>
-        <div>
-          <span style={styles.label}>{msg.goal()}</span>
-          <hr style={styles.hr} />
-          <div style={styles.gemImage} >
-            <i
-              style={{
-                ...styles.checkmark,
-                visibility: showCheckmark ? 'visible' : 'hidden',
-              }}
-              className="fa fa-check"
-              aria-hidden="true"
-            />
-          </div>
-          <span>{this.props.currentCollected}/{this.props.minRequired}</span>
+        <div style={styles.label}>{msg.goal()}</div>
+        <div style={styles.gemImage} >
+          <i
+            style={{
+              ...styles.checkmark,
+              visibility: showCheckmark ? 'visible' : 'hidden',
+            }}
+            className="fa fa-check"
+            aria-hidden="true"
+          />
         </div>
+        <span style={styles.gemCount}>
+          {this.props.currentCollected}/{this.props.minRequired}
+        </span>
       </div>
     );
   }

apps/src/templates/teacherDashboard/DialogFooter.jsx

@@ -1,6 +1,19 @@
 import React, {Component, PropTypes} from 'react';
 
 const style = {
+  aboveFooter: {
+    height: '90px',
+  },
+  footer: {
+    position: 'absolute',
+    height: '80px',
+    padding: '0 20px 20px 20px',
+    left: '0',
+    right: '0',
+    bottom: '0',
+    background: 'white',
+    zIndex: '50',
+  },
   buttonRow: {
     display: 'flex',
     flexFlow: 'row',
@@ -21,9 +34,12 @@ export default class DialogFooter extends Component {
   render() {
     return (
       <div>
-        <hr/>
-        <div style={style.buttonRow}>
-          {this.props.children}
+        <div style={style.aboveFooter}></div>
+        <div style={style.footer}>
+          <hr/>
+          <div style={style.buttonRow}>
+            {this.props.children}
+          </div>
         </div>
       </div>
     );

cookbooks/Berksfile.lock

@@ -61,7 +61,7 @@ GRAPH
     seven_zip (>= 0.0.0)
     windows (>= 0.0.0)
   build-essential (2.1.3)
-  cdo-apps (0.2.239)
+  cdo-apps (0.2.241)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
     cdo-cloudwatch-extra-metrics (>= 0.0.0)

cookbooks/cdo-apps/attributes/default.rb

@@ -1,6 +1,12 @@
 default['cdo-apps'] = {
   'dashboard' => {
     'port' => 8080,
+    'env' => {
+      RUBY_GC_HEAP_FREE_SLOTS: 600_000, # Default is 4096
+      RUBY_GC_MALLOC_LIMIT_MAX: 134_217_728, # 128MB, default is 32MB
+      RUBY_GC_OLDMALLOC_LIMIT_MAX: 1_000_000_000, # 1GB, default is 128MB
+      RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR: 3 # Default is 2.0
+    }
   },
 
   'pegasus' => {

cookbooks/cdo-apps/libraries/cdo_apps.rb

@@ -40,7 +40,8 @@ def setup_app(app_name)
         pid_file: "#{app_root}/config/unicorn.rb.pid",
         user: user,
         env: node.chef_environment,
-        bundle_env: node['cdo-apps']['bundle_env']
+        export_env: node['cdo-apps']['bundle_env'].
+          merge(node['cdo-apps'][app_name]['env'] || {})
       notifies :reload, "service[#{app_name}]", :delayed
     end
 

cookbooks/cdo-apps/metadata.rb

@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures cdo-apps'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.239'
+version          '0.2.241'
 
 depends 'apt'
 depends 'build-essential'

cookbooks/cdo-apps/templates/default/unicorn.sh.erb

@@ -14,7 +14,7 @@ APP_ROOT=<%= @app_root %>
 PID=<%= @pid_file %>
 CMD="cd $APP_ROOT; LANG=en_US.UTF-8 bundle exec unicorn -D -c <%= @src_file %> -E <%= @env %>"
 AS_USER=<%= @user %>
-<%= @bundle_env ? @bundle_env.map{|k,v|"export #{k}=#{v}"}.join("\n") : '' %>
+<%= @export_env ? @export_env.map{|k,v|"export #{k}=#{v}"}.join("\n") : '' %>
 UPGRADE_DELAY=${UPGRADE_DELAY-4}
 
 action="$1"

dashboard/app/helpers/levels_helper.rb

@@ -45,7 +45,7 @@ def readonly_view_options
 
   # Returns the channel associated with the given Level and User pair, or
   # creates a new channel for the pair if one doesn't exist.
-  def get_channel_for(level, user = nil, make_readonly_with_other_user = true)
+  def get_channel_for(level, user = nil)
     # This only works for logged-in users because the storage_id cookie is not
     # sent back to the client if it is modified by ChannelsApi.
     return unless current_user
@@ -55,9 +55,6 @@ def get_channel_for(level, user = nil, make_readonly_with_other_user = true)
       # set_level_source to load answers when looking at another user,
       # we have to load the channel here.
       channel_token = ChannelToken.find_channel_token(level, user)
-      if make_readonly_with_other_user
-        readonly_view_options # TODO: has side effects
-      end
     else
       channel_token = ChannelToken.find_or_create_channel_token(
         level,
@@ -73,10 +70,6 @@ def get_channel_for(level, user = nil, make_readonly_with_other_user = true)
     channel_token.try :channel
   end
 
-  def safe_get_channel_for(level, user)
-    get_channel_for(level, user, false)
-  end
-
   def select_and_track_autoplay_video
     return if @level.try(:autoplay_blocked_by_level?)
 
@@ -135,7 +128,11 @@ def app_options
     # Unsafe to generate these twice, so use the cached version if it exists.
     return @app_options unless @app_options.nil?
 
-    view_options(channel: get_channel_for(@level, @user)) if @level.channel_backed?
+    if @level.channel_backed?
+      view_options(channel: get_channel_for(@level, @user))
+      # readonly if viewing another user's channel
+      readonly_view_options if @user
+    end
 
     # Always pass user age limit
     view_options(is_13_plus: current_user && !current_user.under_13?)
@@ -202,7 +199,7 @@ def app_options
         if recent_attempt
           level_view_options(@level.id, pairing_attempt: edit_level_source_path(recent_attempt)) if recent_attempt
         elsif @level.channel_backed?
-          recent_channel = safe_get_channel_for(@level, recent_user) if recent_user
+          recent_channel = get_channel_for(@level, recent_user) if recent_user
           level_view_options(@level.id, pairing_attempt: send("#{@level.game.app}_project_view_projects_url".to_sym, channel_id: recent_channel)) if recent_channel
         end
       end

dashboard/app/models/levels/craft.rb

@@ -512,7 +512,6 @@ def agent_blocks
   </block>
   <block type='craft_destroyBlock'></block>
   <block type='craft_placeBlock'></block>
-  <block type='craft_placeTorch'></block>
   <block type="when_run"></block>
 </category>
     XML

dashboard/config.ru

@@ -2,8 +2,8 @@
 
 require ::File.expand_path('../config/environment',  __FILE__)
 
-require 'unicorn/oob_gc'
-use Unicorn::OobGC
+require 'gctools/oobgc/unicorn_middleware'
+use GC::OOB::UnicornMiddleware
 use Rack::ContentLength
 require 'rack/ssl-enforcer'
 use Rack::SslEnforcer,

dashboard/test/helpers/levels_helper_test.rb

@@ -213,6 +213,11 @@ def request
     # channel exists
     create :channel_token, level: @level, user: @user, channel: 'whatever'
     assert_equal 'whatever', get_channel_for(@level, @user)
+
+    # calling app_options should set readonly_workspace, since we're viewing for
+    # different user
+    app_options
+    assert_equal true, view_options[:readonly_workspace]
   end
 
   test 'applab levels should include pairing_driver and pairing_attempt when viewed by navigator' do
@@ -230,6 +235,10 @@ def request
 
     assert_not_nil app_options[:level]['pairingDriver']
     assert_not_nil app_options[:level]['pairingAttempt']
+
+    # calling app_options should not set readonly_workspace
+    app_options
+    assert_nil view_options[:readonly_workspace]
   end
 
   def stub_country(code)

dashboard/test/models/user_helpers_test.rb

@@ -36,39 +36,38 @@ def create_user_with_username(username)
   test 'generate_username for existing username via dart throwing' do
     create_user_with_username 'captain_picard'
 
-    # An existing username attempts the username, fails, and receives '6'.
+    # An existing username attempts the username, fails, and receives '784'.
     srand 0
-    assert_equal 'captain_picard6',
+    assert_equal 'captain_picard784',
       UserHelpers.generate_username(User, 'Captain Picard')
-    create_user_with_username 'captain_picard6'
+    create_user_with_username 'captain_picard784'
 
-    # The next Captain Picard attempts '6', fails, and receives '1'
+    # The next Captain Picard attempts '784', fails, and receives '659'
     srand 0
-    assert_equal 'captain_picard1',
+    assert_equal 'captain_picard659',
       UserHelpers.generate_username(User, 'Captain Picard')
-    create_user_with_username 'captain_picard1'
+    create_user_with_username 'captain_picard659'
 
-    # The next Captain Picard attempts '6', fails, attempts '1', fails, and
-    # receives '4'.
+    # The next Captain Picard attempts '784' and '659', fails, and
+    # receives '4264'.
     srand 0
-    assert_equal 'captain_picard4',
+    assert_equal 'captain_picard4264',
       UserHelpers.generate_username(User, 'Captain Picard')
-    create_user_with_username 'captain_picard4'
+    create_user_with_username 'captain_picard4264'
 
-    # The next Captain Picard attempts '6', fails, attempts '1', fails,
-    # attempts '4', fails, and receives '77'.
+    # The next Captain Picard attempts the above, fails and receives '5859'.
     srand 0
-    assert_equal 'captain_picard77',
+    assert_equal 'captain_picard5859',
       UserHelpers.generate_username(User, 'Captain Picard')
   end
 
   test 'generate_username for existing username via fallback' do
-    ['', '6', '1', '4', '77', '19', '93', '377', '854', '904'].each do |suffix|
+    ['', 784, 659, 4264, 5859, 51993, 96293, 54824, 47456, 383298, 593063, 548242, 474564].each do |suffix|
       create_user_with_username "captain_picard#{suffix}"
     end
 
     srand 0
-    assert_equal 'captain_picard905',
+    assert_equal 'captain_picard383299',
       UserHelpers.generate_username(User, 'Captain Picard')
   end
 
@@ -98,7 +97,7 @@ def create_user_with_username(username)
   test 'generate_username' do
     default_params = {email: 'foo@bar.com', password: 'foosbars', name: 'tester', user_type: User::TYPE_STUDENT, age: 28}
     names = ['a', 'b', 'Captain Picard', 'Captain Picard', 'Captain Picard', 'this is a really long name blah blah blah blah blah blah']
-    expected_usernames = %w(coder_a coder_b captain_picard captain_picard6 captain_picard1 this_is_a_really)
+    expected_usernames = %w(coder_a coder_b captain_picard captain_picard784 captain_picard659 this_is_a_really)
 
     i = 0
     users = names.map do |name|