reintroduced bullring, fixed logic attr_accessible problem

Author: jpslav

.rvmrc

@@ -1 +1 @@
-rvm --create ruby-1.9.3@quadbase
+rvm --create ruby-1.9.3-p194@quadbase

Gemfile

@@ -45,14 +45,16 @@ gem 'jsonify-rails', '~> 0.3.2'
 gem 'execjs', '~> 1.4.0'
 gem 'therubyracer', '~> 0.10.1'
 
-gem 'bullring', '~> 0.7.4'
+gem 'bullring', '~> 0.8.1'
 
 group :development, :test do
    gem 'sqlite3', '~> 1.3.6'
-   gem 'ruby-debug19', '~> 0.11.6'
+   gem 'debugger', '~> 1.1.4'
    gem 'faker', '~> 1.0.1'
    gem 'factory_girl_rails', '~> 3.4.0'
    gem 'timecop', '~> 0.3.5'
+   gem 'thin', '~> 1.3.1'
+   gem 'quiet_assets', '~> 1.0.1'
 end
 
 gem 'single_test', '~> 0.5.1'

Gemfile.lock

@@ -30,13 +30,12 @@ GEM
       multi_json (~> 1.0)
     acts-as-taggable-on (2.3.1)
       rails (~> 3.0)
-    archive-tar-minitar (0.5.2)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-x86-mingw32)
     blankslate (2.1.2.4)
     builder (3.0.0)
-    bullring (0.7.4)
+    bullring (0.8.1)
       execjs
       therubyracer
       therubyrhino
@@ -56,12 +55,21 @@ GEM
       execjs
     coffee-script-source (1.3.3)
     columnize (0.3.6)
+    daemons (1.1.8)
+    debugger (1.1.4)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.3)
+    debugger-linecache (1.1.1)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.3)
     devise (2.1.0)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.7)
       railties (~> 3.1)
       warden (~> 1.1.1)
     erubis (2.7.0)
+    eventmachine (0.12.10)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (3.4.0)
@@ -85,8 +93,6 @@ GEM
       actionpack
       jsonify (< 0.4.0)
     libv8 (3.3.10.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -114,6 +120,8 @@ GEM
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
+    quiet_assets (1.0.1)
+      railties (~> 3.1)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -143,16 +151,6 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     recaptcha (0.3.4)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     sass (3.1.19)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
@@ -173,6 +171,10 @@ GEM
     therubyracer (0.10.1)
       libv8 (~> 3.3.10)
     therubyrhino (1.73.4)
+    thin (1.3.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     thor (0.15.2)
     tilt (1.3.3)
     timecop (0.3.5)
@@ -195,9 +197,10 @@ PLATFORMS
 
 DEPENDENCIES
   acts-as-taggable-on (~> 2.3.1)
-  bullring (~> 0.7.4)
+  bullring (~> 0.8.1)
   capistrano (~> 2.12.0)
   coffee-rails (~> 3.2.2)
+  debugger (~> 1.1.4)
   devise (~> 2.1.0)
   execjs (~> 1.4.0)
   factory_girl_rails (~> 3.4.0)
@@ -209,16 +212,17 @@ DEPENDENCIES
   mysql2 (~> 0.3.11)
   paperclip (~> 3.0.4)
   parslet (~> 1.4.0)
+  quiet_assets (~> 1.0.1)
   rack-ssl-enforcer (~> 0.2.4)
   rails (= 3.2.4)
   rails3-jquery-autocomplete (~> 1.0.7)
   recaptcha (~> 0.3.4)
-  ruby-debug19 (~> 0.11.6)
   sass-rails (~> 3.2.5)
   single_test (~> 0.5.1)
   sqlite3 (~> 1.3.6)
   squeel (~> 1.0.5)
   therubyracer (~> 0.10.1)
+  thin (~> 1.3.1)
   timecop (~> 0.3.5)
   uglifier (~> 1.2.4)
   will_paginate (~> 3.0.3)

app/models/logic.rb

@@ -20,7 +20,7 @@ class Logic < ActiveRecord::Base
   serialize :variables_array
   serialize :required_logic_library_version_ids
 
-  attr_accessible :variables
+  attr_accessible :variables, :code, :required_logic_library_version_ids
 
   JS_RESERVED_WORDS_REGEX = /^(do|if|in|for|let|new|try|var|case|else|enum|eval|
                                false|null|this|true|void|with|break|catch|class|
@@ -35,8 +35,6 @@ class Logic < ActiveRecord::Base
   VARIABLE_REGEX = /^[_a-zA-Z]{1}\w*$/
 
   def run(options = {})
-    return Output.new # temp fix to block bullring
-    
     options[:seed] ||= rand(2e9)
     options[:prior_output] ||= Output.new
     options[:library_version_ids] ||= required_logic_library_version_ids
@@ -80,8 +78,6 @@ def content_copy
 protected
 
   def code_compiles
-    errors.add(:base, "Logic authoring temporarily disabled") if !code.blank?; return false  # Temp fix to block bullring
-    
     code_errors = Bullring.check(code)
     code_errors.each do |code_error|
       next if code_error.nil?

app/models/logic_library_version.rb

@@ -30,7 +30,6 @@ def v_dot
   end
 
   def send_to_bullring
-    raise NotYetImplemented # temp fix to block Bullring
     Bullring.add_library(id.to_s, code)
   end
 

config/initializers/bullring.rb

@@ -1,21 +1,21 @@
 # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
 # License version 3 or later.  See the COPYRIGHT file for details.
 
-# Bullring.logger = Rails.logger
-# 
-# Bullring.configure do |config|
-#   config.execution_timeout_secs = 0.3
-#   config.server_port = 3033
-#   config.jvm_init_heap_size = '80m'
-#   config.jvm_max_heap_size = '80m'
-#   config.jvm_young_heap_size = '40m'
-#   config.server_max_bringup_time = 40
-# end
-# 
-# # Give Bullring all the library scripts, don't do this until the migration
-# # actually sets up the table!
-# if ActiveRecord::Base.connection.tables.include?("logic_library_versions")
-#   LogicLibraryVersion.all.each do |version|
-#     version.send_to_bullring
-#   end
-# end
+Bullring.logger = Rails.logger
+
+Bullring.configure do |config|
+  config.execution_timeout_secs = 0.3
+  config.first_server_port = 3033
+  config.jvm_init_heap_size = '80m'
+  config.jvm_max_heap_size = '80m'
+  config.jvm_young_heap_size = '40m'
+  config.server_max_bringup_time = 40
+end
+
+# Give Bullring all the library scripts, don't do this until the migration
+# actually sets up the table!
+if ActiveRecord::Base.connection.tables.include?("logic_library_versions")
+  LogicLibraryVersion.all.each do |version|
+    version.send_to_bullring
+  end
+end