Merge pull request code-dot-org#829 from code-dot-org/staging

DTT

Author: laurelfan

blockly/test/solutions/studio/sandbox.js

@@ -1,6 +1,7 @@
 var TestResults = require('../../../src/constants.js').TestResults;
 var _ = require('../../../build/js/lodash');
 var Direction = require('../../../src/studio/constants.js').Direction;
+var blockUtils = require('../../../src/block_utils');
 
 /**
  * Runs the given function at the provided tick count
@@ -772,6 +773,39 @@ module.exports = {
         result: true,
         testResult: TestResults.FREE_PLAY
       }
+    },
+    {
+      description: 'random background/avatar',
+      xml: '<xml>' +
+        blockUtils.blockWithNext('when_run', {},
+          blockUtils.blockWithNext('studio_setSprite', {
+            SPRITE: 0,
+            VALUE: 'random'
+          },
+          blockUtils.blockOfType('studio_setBackground', {
+            VALUE: 'random'
+          })
+          )
+        ) + '</xml>',
+      runBeforeClick: function (assert) {
+        runOnTick (5, function () {
+          var sprite = document.getElementById('sprite0');
+          var vis = sprite.getAttribute('visibility');
+          assert(sprite.getAttribute('visibility') === 'visible', 'vis: ' + vis);
+          assert(sprite.getAttribute('xlink:href') !== undefined);
+
+          var background = document.getElementById('background');
+          assert(background.getAttribute('xlink:href') !== undefined);
+
+        });
+        runOnTick (6, function () {
+          Studio.onPuzzleComplete();
+        });
+      },
+      expected: {
+        result: true,
+        testResult: TestResults.FREE_PLAY
+      }
     }
   ]
 };

dashboard/app/controllers/activities_controller.rb

@@ -47,7 +47,6 @@ def milestone
 
     # Store the image only if the image is set, and the image has not been saved
     if params[:image] && @level_source.try(:id)
-      # don't create new level source images temporarily
       @level_source_image = LevelSourceImage.find_by(level_source_id: @level_source.id)
       unless @level_source_image
         @level_source_image = LevelSourceImage.new(level_source_id: @level_source.id)

dashboard/app/models/level_source.rb

@@ -1,9 +1,5 @@
 require 'digest/md5'
 
-def level_source_cache()
-  @@level_sources_redis ||= rack_env?(:production) ? Redis.connect(url:CDO.level_sources_redis_url) : Hash.new
-end
-
 # A specific solution attempt for a specific level
 class LevelSource < ActiveRecord::Base
   belongs_to :level
@@ -19,12 +15,21 @@ class LevelSource < ActiveRecord::Base
   # A level_source is considered to be standardized if it does not have this.
   XMLNS_STRING = ' xmlns="http://www.w3.org/1999/xhtml"'
 
+  def LevelSource.cache_enabled?
+    @@cache_enabled ||= false
+    rack_env?(:production) || @@cache_enabled
+  end
+
+  def LevelSource.level_source_cache()
+    @@level_sources_redis ||= rack_env?(:production) ? Redis.connect(url:CDO.level_sources_redis_url) : Hash.new
+  end
+
   def self.find_identical_or_create(level, data)
     md5 = Digest::MD5.hexdigest(data)
 
     redis_key = "v5-#{level.id}-#{md5}"
 
-    cached_json = level_source_cache[redis_key] if rack_env?(:production)
+    cached_json = LevelSource.level_source_cache[redis_key] if LevelSource.cache_enabled?
     level_source_object = OpenStruct.new(JSON.parse(cached_json)) if cached_json
 
     unless level_source_object
@@ -34,7 +39,7 @@ def self.find_identical_or_create(level, data)
       return nil unless level_source_object
 
       level_source_hash = {id:level_source_object.id, hidden:level_source_object.hidden}
-      level_source_cache[redis_key] = level_source_hash.to_json if rack_env?(:production)
+      LevelSource.level_source_cache[redis_key] = level_source_hash.to_json if LevelSource.cache_enabled?
 
       level_source_object = OpenStruct.new(level_source_hash)
     end

dashboard/app/models/script.rb

@@ -2,8 +2,8 @@
 class Script < ActiveRecord::Base
   include Seeded
   has_many :levels, through: :script_levels
-  has_many :script_levels, -> { order('chapter ASC') }, dependent: :destroy # all script levels, even those w/ stages, are ordered by chapter, see Script#add_script
-  has_many :stages, -> { order('position ASC') }, dependent: :destroy
+  has_many :script_levels, -> { order('chapter ASC') }, dependent: :destroy, inverse_of: :script # all script levels, even those w/ stages, are ordered by chapter, see Script#add_script
+  has_many :stages, -> { order('position ASC') }, dependent: :destroy, inverse_of: :script
   belongs_to :wrapup_video, foreign_key: 'wrapup_video_id', class_name: 'Video'
   belongs_to :user
   validates :name, presence: true, uniqueness: { case_sensitive: false}
@@ -58,6 +58,10 @@ def cached?
         self.equal?(Script.playlab_script)
   end
 
+  def Script.should_be_cached?(id)
+    Script.script_cache.has_key?(id.to_s)
+  end
+
   def should_be_cached?
     Script.script_cache.has_key?(id.to_s)
   end

dashboard/app/models/script_level.rb

@@ -2,8 +2,8 @@
 # A Script has one or more Levels, and a Level can belong to one or more Scripts
 class ScriptLevel < ActiveRecord::Base
   belongs_to :level
-  belongs_to :script
-  belongs_to :stage
+  belongs_to :script, inverse_of: :script_levels
+  belongs_to :stage, inverse_of: :script_levels
   acts_as_list scope: :stage
 
   NEXT = 'next'
@@ -31,7 +31,16 @@ def or_next_progression_level
     valid_progression_level? ? self : next_progression_level
   end
 
+  def cached_valid_progression_level?
+    cached_script = Script.get_from_cache(script_id)
+    cached_script_level = cached_script.script_levels.to_a.find{|sl| sl.id == self.id}
+    return false if cached_script_level.level.unplugged?
+    return false if cached_script_level.stage && cached_script_level.stage.unplugged?
+    true
+  end
+
   def valid_progression_level?
+    return cached_valid_progression_level? if Script.should_be_cached?(script_id)
     return false if level.unplugged?
     return false if stage && stage.unplugged?
     true
@@ -103,7 +112,7 @@ def stage_or_game_total
   end
 
   def self.cache_find(id)
-    @@script_level_map ||= ScriptLevel.includes(:level, :script).index_by(&:id)
+    @@script_level_map ||= ScriptLevel.includes([{level: [:game, :concepts]}, :script]).index_by(&:id)
     @@script_level_map[id]
   end
 

dashboard/app/models/stage.rb

@@ -1,8 +1,8 @@
 # Ordered partitioning of script levels within a script
 # (Intended to replace most of the functionality in Game, due to the need for multiple app types within a single Game/Stage)
 class Stage < ActiveRecord::Base
-  has_many :script_levels, -> { order('position ASC') }
-  belongs_to :script
+  has_many :script_levels, -> { order('position ASC') }, inverse_of: :stage
+  belongs_to :script, inverse_of: :stages
   acts_as_list scope: :script
 
   validates_uniqueness_of :name, scope: :script_id

dashboard/app/models/user.rb

@@ -244,7 +244,10 @@ def levels_from_script(script, game_index=nil, stage=nil)
 
   def next_unpassed_progression_level(script)
     user_levels_by_level = self.user_levels.index_by(&:level_id)
-    script.script_levels.detect do |script_level|
+    cached_script = script
+    cached_script = Script.get_from_cache(script.id) if script.should_be_cached?
+    
+    cached_script.script_levels.detect do |script_level|
       user_level = user_levels_by_level[script_level.level_id]
       is_unpassed_progression_level(script_level, user_level)
     end

dashboard/app/models/user_script.rb

@@ -5,7 +5,7 @@ class UserScript < ActiveRecord::Base
   def check_completed?
     # the script is completed if there are no more "progression levels" to be completed
     # (unplugged levels are not progression levels, for one)
-    user.next_unpassed_progression_level(script).nil?
+    user.next_unpassed_progression_level(Script.get_from_cache(script_id)).nil?
   end
 
   def empty?

dashboard/app/views/shared/_user_stats.html.haml

@@ -1,5 +1,5 @@
 - script = @script || (user && user.primary_script) || Script.twenty_hour_script
-- script_levels = user ? user.levels_from_script(script) : script.script_levels.includes(:script, :stage, level: :game)
+- script_levels = user ? user.levels_from_script(script) : script.script_levels
 -# concept_progress = user ? user.concept_progress : nil
 
 .user-stats-block

dashboard/config/environments/test.rb

@@ -43,4 +43,8 @@
 
   # disable this for test by default, it won't make much sense if we keep wiping the db
   CDO.disable_s3_image_uploads = true
+
+  # see stack traces around sql queries in the log
+  # off by default because it slows things down
+#  ActiveRecordQueryTrace.enabled = true
 end

dashboard/test/integration/caching_test.rb

@@ -1,20 +1,36 @@
 require 'test_helper'
 
 class CachingTest < ActionDispatch::IntegrationTest
-  
-  setup do
-    Script.send(:clear_cache)
+
+  def setup
+    Script.clear_cache
+    LevelSource.class_variable_set(:@@cache_enabled, true)
   end
-  
-  test "should get show of frozen level 1" do
-    get '/s/frozen/stage/1/puzzle/1'
-    assert_response :success
 
+  def no_database
     Rails.logger.info '--------------'
-    Rails.logger.info 'SECOND REQUEST'
+    Rails.logger.info 'DISCONNECTING DATABASE'
     Rails.logger.info '--------------'
 
     ActiveRecord::Base.connection.disconnect!
+  end
+
+  test "should get /s/frozen" do
+    get '/s/frozen'
+    assert_response :success
+
+    no_database
+
+    get '/s/frozen'
+    assert_response :success
+  end
+  
+  test "should get show of frozen level 1" do
+    get '/s/frozen/stage/1/puzzle/1'
+    assert_response :success
+
+    no_database
+
     get '/s/frozen/stage/1/puzzle/1'
     assert_response :success
   end
@@ -23,11 +39,8 @@ class CachingTest < ActionDispatch::IntegrationTest
     get '/s/frozen/stage/1/puzzle/10'
     assert_response :success
 
-    Rails.logger.info '--------------'
-    Rails.logger.info 'SECOND REQUEST'
-    Rails.logger.info '--------------'
-    
-    ActiveRecord::Base.connection.disconnect!
+    no_database
+
     get '/s/frozen/stage/1/puzzle/10'
     assert_response :success
   end
@@ -36,11 +49,8 @@ class CachingTest < ActionDispatch::IntegrationTest
     get '/s/frozen/stage/1/puzzle/20'
     assert_response :success
 
-    Rails.logger.info '--------------'
-    Rails.logger.info 'SECOND REQUEST'
-    Rails.logger.info '--------------'
-    
-    ActiveRecord::Base.connection.disconnect!
+    no_database
+
     get '/s/frozen/stage/1/puzzle/20'
     assert_response :success
   end
@@ -50,28 +60,60 @@ class CachingTest < ActionDispatch::IntegrationTest
     get '/s/frozen/stage/1/puzzle/1'
     assert_response :success
 
-    Rails.logger.info '--------------'
-    Rails.logger.info 'SECOND REQUEST'
-    Rails.logger.info '--------------'
-    
-    ActiveRecord::Base.connection.disconnect!
+    no_database
+
     get '/s/frozen/stage/1/puzzle/10'
     assert_response :success
   end
 
+  test "post milestone to frozen passing" do
+    sl = Script.find_by_name('frozen').script_levels[2]
+    params = {program: 'fake program', testResult: 100, result: 'true'}
+
+    post "milestone/0/#{sl.id}", params
+    assert_response 200
+
+    no_database
+
+    post "milestone/0/#{sl.id}", params
+    assert_response 200
+  end
+
+  test "post milestone to frozen failing" do
+    sl = Script.find_by_name('frozen').script_levels[2]
+    params = {program: 'fake program', testResult: 5, result: 'false'}
+
+    post "milestone/0/#{sl.id}", params
+    assert_response 200
+
+    no_database
+
+    post "milestone/0/#{sl.id}", params
+    assert_response 200
+  end
+
 
   # course1 is not caching yet
   # test "should get show of course1 level 1 and then level 10" do
   #   get '/s/course1/stage/1/puzzle/1'
   #   assert_response :success
 
-  #   Rails.logger.info '--------------'
-  #   Rails.logger.info 'SECOND REQUEST'
-  #   Rails.logger.info '--------------'
-    
-  #   ActiveRecord::Base.connection.disconnect!
+  #   no_database
+
   #   get '/s/course1/stage/1/puzzle/10'
   #   assert_response :success
   # end
 
+  # test "post milestone to course1" do
+  #   sl = Script.find_by_name('course1').script_levels[2]
+
+  #   post "milestone/0/#{sl.id}"
+  #   assert_response 200
+
+  #   no_database
+
+  #   post "milestone/0/#{sl.id}"
+  #   assert_response 200
+  # end
+
 end