RubyGems - marty - Versions diffs - 2.4.7 → 2.4.8 - Mend

marty 2.4.7 → 2.4.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (225) hide show

data/app/components/marty/simple_app/client/simple_app.js CHANGED

@@ -1,34 +1,42 @@
 {
-  initComponent: function(){
+  initComponent: function () {
     this.callParent();
     this.mainPanel = this.down('panel[itemId="main_panel"]');
-    this.menuBar   = this.down('container[itemId="menu_bar"]');
+    this.menuBar = this.down('container[itemId="menu_bar"]');
     var statusBar = this.statusBar = this.down('container[itemId="status_bar"]');
     // Setting the "busy" indicator for Ajax requests
-    Ext.Ajax.on('beforerequest',    function(){ statusBar.showBusy(); });
-    Ext.Ajax.on('requestcomplete',  function(){ statusBar.hideBusy(); });
-    Ext.Ajax.on('requestexception', function(){ statusBar.hideBusy(); });
+    Ext.Ajax.on('beforerequest', function () {
+      statusBar.showBusy();
+    });
+    Ext.Ajax.on('requestcomplete', function () {
+      statusBar.hideBusy();
+    });
+    Ext.Ajax.on('requestexception', function () {
+      statusBar.hideBusy();
+    });
     this.setRouting();
   },
-  setRouting: function(){
+  setRouting: function () {
     this.router = Ext.util.History;
     this.router.init();
     this.router.on('change', this.loadRoute, this);
   },
-  loadRoute: function(token){
-    if (token){
-      this.netzkeLoadComponent(token, {container: this.mainPanel});
+  loadRoute: function (token) {
+    if (token) {
+      this.netzkeLoadComponent(token, {
+        container: this.mainPanel
+      });
     } else {
       this.mainPanel.removeAll();
     }
   },
-  afterRender: function(){
+  afterRender: function () {
     this.callParent();
     var currentToken = this.router.getToken();
     if (typeof currentToken == "string" && currentToken.length > 0) {
@@ -36,15 +44,15 @@
     }
   },
-  appLoadComponent: function(name) {
+  appLoadComponent: function (name) {
     this.router.add(name);
   },
-  netzkeLoadComponentByAction: function(action){
+  netzkeLoadComponentByAction: function (action) {
     this.router.add(action.name.underscore());
   },
-  onToggleConfigMode: function(params){
+  onToggleConfigMode: function (params) {
     this.toggleConfigMode();
   }
 }

data/app/models/marty/promise.rb CHANGED

@@ -150,7 +150,28 @@ class Marty::Promise < Marty::Base
       if !last.start_dt
         job = Marty::Promise.job_by_id(last.job_id)
-        wait_for_my_notify(Marty::Promise::DEFAULT_JOB_TIMEOUT)
+        # FIXME: this block is needed since a lot of specs rely on delayed job being runned in the same thread as promise
+        # Can be deleted later and replaces with simple timeout below
+        if !job || job.locked_at
+          # job has been locked, so it looks like it started already
+          # and we need to wait for it.
+          wait_for_my_notify(Marty::Promise::DEFAULT_JOB_TIMEOUT)
+        else
+          # work off the job instead of waiting for a real worker to
+          # pick it up.
+          # log "OFF0 #{Process.pid} #{last}"
+          begin
+            work_off_job(job)
+          rescue => exc
+            # log "OFFERR #{exc}"
+            res = Delorean::Engine.grok_runtime_exception(exc)
+            last.set_result(res)
+          end
+          # log "OFF1 #{Process.pid} #{last}"
+        end
+        # FIXME enable after problem with specs is solved
+        # wait_for_my_notify(Marty::Promise::DEFAULT_JOB_TIMEOUT)
         last = latest

data/app/views/layouts/marty/application.html.erb CHANGED

@@ -6,10 +6,12 @@
 	  integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ"
 	  crossorigin="anonymous">
     <title><%= Rails.application.class.parent %></title>
-  <%= load_netzke theme: Rails.configuration.marty.extjs_theme %>
-  <%= csrf_meta_tag %>
-</head>
-<body>
-<%= yield %>
-</body>
+    <%= load_netzke theme: Rails.configuration.marty.extjs_theme %>
+    <%= csrf_meta_tag %>
+    <%= javascript_include_tag 'marty/application' %>
+    <%= stylesheet_link_tag 'marty/application' %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
 </html>

data/docker-compose.dummy.yml CHANGED

@@ -13,6 +13,8 @@ services:
       - "PATH=/bundle_box/bundle/bin:/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
       - "DEVELOPMENT_DATABASE_URL=postgres://postgres@postgres/marty_dev"
       - "TEST_DATABASE_URL=postgres://postgres@postgres/marty_test"
+      - "HEADLESS_WINDOW_SIZE=1400,1400"
+      - "HEADLESS=true"
     # env_file: ".rbenv-vars"
     depends_on:
       - "postgres"

data/lib/marty/monkey.rb CHANGED

@@ -288,22 +288,6 @@ module Netzke
   module Core
     module DynamicAssets
       class << self
-        def ext_js(form_authenticity_token)
-          res = initial_dynamic_javascript(form_authenticity_token) << "\n"
-          include_core_js(res)
-          # MONKEY: load marty custom javascript
-          marty_javascripts = Dir["#{File.dirname(__FILE__)}/javascript/*.js"]
-          (Netzke::Core.ext_javascripts + marty_javascripts).each do |path|
-            f = File.new(path)
-            res << f.read
-          end
-          minify_js(res)
-        end
         def minify_js(js_string)
           if ::Rails.env.test? || ::Rails.env.development?
             js_string.gsub(/\/\*\*[^*]*\*+(?:[^*\/][^*]*\*+)*\//, '') # strip docs

data/lib/marty/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.4.7"
+  VERSION = "2.4.8"
 end

data/spec/dummy/config/initializers/assets.rb ADDED

	@@ -0,0 +1 @@
1	+ Rails.application.config.assets.precompile = ['.js', '.css']

data/spec/features/reporting_spec.rb CHANGED

@@ -201,6 +201,7 @@ DELOREAN
       set_field_value('XYZ', '', 'pt_name')
       # hidden field that causes results to be inlined
       set_field_value('true', 'textfield', 'selected_testing')
       press("Generate Report")
     end

data/spec/features/scripting_spec.rb CHANGED

@@ -224,7 +224,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
     and_by 'form displays correct body' do
       wait_for_ajax
-      expect(page).to have_content "#5\n#1\n#2\n#3\n"
+      expect(page).to have_content "1 #5 2 #1 3 #2 4 #3"
     end
     and_by 'select different tag' do
@@ -238,7 +238,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
     and_by 'form displays updated body' do
       wait_for_ajax
-      expect(page).to have_content "#5\n#1\n"
+      expect(page).to have_content "1 #5 2 #1"
     end
   end
@@ -274,7 +274,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
       script_grid.select_row(1)
       script_grid.select_row(5)
       wait_for_ajax
-      expect(page).not_to have_content "#123\n#456\n"
+      expect(page).not_to have_content "1 #123 2 #456"
       script_grid.select_row(1)
     end
@@ -291,7 +291,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
       tag_grid.select_row(2)
       wait_for_ajax
       script_grid.select_row(5)
-      expect(page).to have_content "#123\n#456\n"
+      expect(page).to have_content "1 #123 2 #456"
       expect(tag_grid.get_row_vals(2)).to netzke_include({:comment=>"ABCD"})
     end
   end

data/spec/spec_helper.rb CHANGED

@@ -1,4 +1,5 @@
 ENV["RAILS_ENV"] ||= "test"
+ENV["TZ"] ||= "America/Los_Angeles"
 require 'dummy/config/application'
 require 'rspec/rails'

data/spec/support/chromedriver.rb CHANGED

@@ -10,6 +10,7 @@ module Marty; module RSpec; module Chromedriver
                   Marty::RSpec::DownloadHelper::PATH.to_s}),
         pageLoadStrategy: 'none',
       }
       caps = Selenium::WebDriver::Remote::Capabilities.chrome(copts)
       driver = Capybara::Selenium::Driver.new(app,
                                               browser: :chrome,
@@ -21,7 +22,9 @@ module Marty; module RSpec; module Chromedriver
   register_chrome_driver
-  headless_args =  %w[headless disable-gpu window-size=3840,2160]
+  window_size = ENV.fetch('HEADLESS_WINDOW_SIZE', '3840,2160')
+  headless_args = ['no-sandbox', 'headless', 'disable-gpu', "window-size=#{window_size}"]
   register_chrome_driver(:headless_chrome, args: headless_args) do |driver|
     # workaround to enable downloading with headless chrome
@@ -38,4 +41,5 @@ module Marty; module RSpec; module Chromedriver
   Capybara.default_driver    = :chrome
   Capybara.javascript_driver = ENV['HEADLESS'] == 'true' ?
                                  :headless_chrome : :chrome
 end end end

data/spec/support/shared_connection_db_helpers.rb CHANGED

@@ -4,15 +4,55 @@ module Marty; module RSpec; module SharedConnectionDbHelpers
   end
   def save_clean_db(clean_file)
-    `pg_dump -O -Fc #{current_db} > #{clean_file}`
+    if db_host == 'localhost'
+      `pg_dump -O -Fc #{current_db} > #{clean_file}`
+    else
+      `#{remote_db_pw} pg_dump -O -Fc #{remote_db_args} #{current_db} > #{clean_file}`
+    end
   end
   def restore_clean_db(clean_file, remove_file = true)
     self.use_transactional_tests = false
-    `pg_restore -j 2 -O -x -c -d #{current_db} #{clean_file}`
+    if db_host == 'localhost'
+      `pg_restore -j 2 -O -x -c -d #{current_db} #{clean_file}`
+    else
+      `#{remote_db_pw} pg_restore #{remote_db_args} #{restore_args(current_db, clean_file)}`
+    end
     `rm -f #{clean_file}` if remove_file
     ActiveRecord::Base.clear_all_connections!
     ActiveRecord::Base.reset_shared_connection
     self.use_transactional_tests = true
   end
+  private
+  def current_db
+    ActiveRecord::Base.connection_config[:database]
+  end
+  def db_host
+    ActiveRecord::Base.connection_config[:host] || 'localhost'
+  end
+  def db_user
+    ActiveRecord::Base.connection_config[:username]
+  end
+  def db_password
+    ActiveRecord::Base.connection_config[:password]
+  end
+  def restore_args db, from
+    "-j 2 -O -x -c -d #{db} #{from}"
+  end
+  def remote_db_args
+    "-h #{db_host} -U #{db_user} -w"
+  end
+  def remote_db_pw
+    "PGPASSWORD='#{db_password}'"
+  end
 end end end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -194,8 +194,16 @@ files:
 - Makefile
 - README.md
 - Rakefile
-- app/assets/images/marty/.gitkeep
+- app/assets/javascripts/marty/application.js
+- app/assets/javascripts/marty/codemirror/codemirror.js
+- app/assets/javascripts/marty/codemirror/mode/delorean/delorean.js
+- app/assets/javascripts/marty/codemirror/mode/javascript/javascript.js
+- app/assets/javascripts/marty/codemirror/mode/python/python.js
+- app/assets/javascripts/marty/codemirror/mode/ruby/ruby.js
+- app/assets/javascripts/marty/extjs/extensions/marty.js
 - app/assets/stylesheets/marty/application.css
+- app/assets/stylesheets/marty/codemirror/codemirror.css
+- app/assets/stylesheets/marty/codemirror/delorean.css
 - app/components/marty/api_auth_view.rb
 - app/components/marty/api_config_view.rb
 - app/components/marty/api_log_view.rb
@@ -204,198 +212,51 @@ files:
 - app/components/marty/base_rule_view.rb
 - app/components/marty/config_view.rb
 - app/components/marty/data_grid_view.rb
+- app/components/marty/data_grid_view/client/data_grid_view.js
 - app/components/marty/delorean_rule_view.rb
 - app/components/marty/event_view.rb
 - app/components/marty/extras/layout.rb
 - app/components/marty/extras/misc.rb
 - app/components/marty/form.rb
+- app/components/marty/form/client/form.js
 - app/components/marty/grid.rb
+- app/components/marty/grid/client/grid.js
 - app/components/marty/grid_append_only.rb
 - app/components/marty/import_type_view.rb
 - app/components/marty/import_view.rb
+- app/components/marty/import_view/client/import_view.js
 - app/components/marty/live_search_grid_panel.rb
+- app/components/marty/live_search_grid_panel/client/live_search_grid_panel.js
 - app/components/marty/log_view.rb
 - app/components/marty/main_auth_app.rb
+- app/components/marty/main_auth_app/client/main_auth_app.js
 - app/components/marty/mcfly_grid_panel.rb
-- app/components/marty/mcfly_grid_panel/client/dup_in_form.js
+- app/components/marty/mcfly_grid_panel/client/mcfly_grid_panel.js
 - app/components/marty/new_posting_form.rb
+- app/components/marty/new_posting_form/client/new_posting_form.js
 - app/components/marty/new_posting_window.rb
 - app/components/marty/panel.rb
+- app/components/marty/panel/client/panel.js
 - app/components/marty/posting_grid.rb
+- app/components/marty/posting_grid/client/posting_grid.js
 - app/components/marty/posting_window.rb
 - app/components/marty/promise_view.rb
 - app/components/marty/promise_view/client/promise_view.css
+- app/components/marty/promise_view/client/promise_view.js
 - app/components/marty/record_form_window.rb
 - app/components/marty/report_form.rb
+- app/components/marty/report_form/client/report_form.js
 - app/components/marty/report_select.rb
+- app/components/marty/report_select/client/report_select.js
 - app/components/marty/reporting.rb
+- app/components/marty/reporting/client/reporting.js
 - app/components/marty/script_form.rb
-- app/components/marty/script_form/client/Ext.ux.form.field.CodeMirror.js
-- app/components/marty/script_form/client/codemirror.css
-- app/components/marty/script_form/client/codemirror.js
-- app/components/marty/script_form/client/delorean.css
-- app/components/marty/script_form/client/mode/clike/clike.js
-- app/components/marty/script_form/client/mode/clike/index.html
-- app/components/marty/script_form/client/mode/clike/scala.html
-- app/components/marty/script_form/client/mode/clojure/clojure.js
-- app/components/marty/script_form/client/mode/clojure/index.html
-- app/components/marty/script_form/client/mode/coffeescript/LICENSE
-- app/components/marty/script_form/client/mode/coffeescript/coffeescript.js
-- app/components/marty/script_form/client/mode/coffeescript/index.html
-- app/components/marty/script_form/client/mode/commonlisp/commonlisp.js
-- app/components/marty/script_form/client/mode/commonlisp/index.html
-- app/components/marty/script_form/client/mode/css/css.js
-- app/components/marty/script_form/client/mode/css/index.html
-- app/components/marty/script_form/client/mode/css/test.js
-- app/components/marty/script_form/client/mode/delorean/delorean.js
-- app/components/marty/script_form/client/mode/diff/diff.js
-- app/components/marty/script_form/client/mode/diff/index.html
-- app/components/marty/script_form/client/mode/ecl/ecl.js
-- app/components/marty/script_form/client/mode/ecl/index.html
-- app/components/marty/script_form/client/mode/erlang/erlang.js
-- app/components/marty/script_form/client/mode/erlang/index.html
-- app/components/marty/script_form/client/mode/gfm/gfm.js
-- app/components/marty/script_form/client/mode/gfm/index.html
-- app/components/marty/script_form/client/mode/go/go.js
-- app/components/marty/script_form/client/mode/go/index.html
-- app/components/marty/script_form/client/mode/groovy/groovy.js
-- app/components/marty/script_form/client/mode/groovy/index.html
-- app/components/marty/script_form/client/mode/haskell/haskell.js
-- app/components/marty/script_form/client/mode/haskell/index.html
-- app/components/marty/script_form/client/mode/haxe/haxe.js
-- app/components/marty/script_form/client/mode/haxe/index.html
-- app/components/marty/script_form/client/mode/htmlembedded/htmlembedded.js
-- app/components/marty/script_form/client/mode/htmlembedded/index.html
-- app/components/marty/script_form/client/mode/htmlmixed/htmlmixed.js
-- app/components/marty/script_form/client/mode/htmlmixed/index.html
-- app/components/marty/script_form/client/mode/javascript/index.html
-- app/components/marty/script_form/client/mode/javascript/javascript.js
-- app/components/marty/script_form/client/mode/jinja2/index.html
-- app/components/marty/script_form/client/mode/jinja2/jinja2.js
-- app/components/marty/script_form/client/mode/less/index.html
-- app/components/marty/script_form/client/mode/less/less.js
-- app/components/marty/script_form/client/mode/lua/index.html
-- app/components/marty/script_form/client/mode/lua/lua.js
-- app/components/marty/script_form/client/mode/markdown/index.html
-- app/components/marty/script_form/client/mode/markdown/markdown.js
-- app/components/marty/script_form/client/mode/markdown/test.js
-- app/components/marty/script_form/client/mode/mysql/index.html
-- app/components/marty/script_form/client/mode/mysql/mysql.js
-- app/components/marty/script_form/client/mode/ntriples/index.html
-- app/components/marty/script_form/client/mode/ntriples/ntriples.js
-- app/components/marty/script_form/client/mode/ocaml/index.html
-- app/components/marty/script_form/client/mode/ocaml/ocaml.js
-- app/components/marty/script_form/client/mode/pascal/LICENSE
-- app/components/marty/script_form/client/mode/pascal/index.html
-- app/components/marty/script_form/client/mode/pascal/pascal.js
-- app/components/marty/script_form/client/mode/perl/LICENSE
-- app/components/marty/script_form/client/mode/perl/index.html
-- app/components/marty/script_form/client/mode/perl/perl.js
-- app/components/marty/script_form/client/mode/php/index.html
-- app/components/marty/script_form/client/mode/php/php.js
-- app/components/marty/script_form/client/mode/pig/index.html
-- app/components/marty/script_form/client/mode/pig/pig.js
-- app/components/marty/script_form/client/mode/plsql/index.html
-- app/components/marty/script_form/client/mode/plsql/plsql.js
-- app/components/marty/script_form/client/mode/properties/index.html
-- app/components/marty/script_form/client/mode/properties/properties.js
-- app/components/marty/script_form/client/mode/python/LICENSE.txt
-- app/components/marty/script_form/client/mode/python/index.html
-- app/components/marty/script_form/client/mode/python/python.js
-- app/components/marty/script_form/client/mode/r/LICENSE
-- app/components/marty/script_form/client/mode/r/index.html
-- app/components/marty/script_form/client/mode/r/r.js
-- app/components/marty/script_form/client/mode/rpm/changes/changes.js
-- app/components/marty/script_form/client/mode/rpm/changes/index.html
-- app/components/marty/script_form/client/mode/rpm/spec/index.html
-- app/components/marty/script_form/client/mode/rpm/spec/spec.css
-- app/components/marty/script_form/client/mode/rpm/spec/spec.js
-- app/components/marty/script_form/client/mode/rst/index.html
-- app/components/marty/script_form/client/mode/rst/rst.js
-- app/components/marty/script_form/client/mode/ruby/LICENSE
-- app/components/marty/script_form/client/mode/ruby/index.html
-- app/components/marty/script_form/client/mode/ruby/ruby.js
-- app/components/marty/script_form/client/mode/rust/index.html
-- app/components/marty/script_form/client/mode/rust/rust.js
-- app/components/marty/script_form/client/mode/scheme/index.html
-- app/components/marty/script_form/client/mode/scheme/scheme.js
-- app/components/marty/script_form/client/mode/shell/index.html
-- app/components/marty/script_form/client/mode/shell/shell.js
-- app/components/marty/script_form/client/mode/sieve/LICENSE
-- app/components/marty/script_form/client/mode/sieve/index.html
-- app/components/marty/script_form/client/mode/sieve/sieve.js
-- app/components/marty/script_form/client/mode/smalltalk/index.html
-- app/components/marty/script_form/client/mode/smalltalk/smalltalk.js
-- app/components/marty/script_form/client/mode/smarty/index.html
-- app/components/marty/script_form/client/mode/smarty/smarty.js
-- app/components/marty/script_form/client/mode/sparql/index.html
-- app/components/marty/script_form/client/mode/sparql/sparql.js
-- app/components/marty/script_form/client/mode/stex/index.html
-- app/components/marty/script_form/client/mode/stex/stex.js
-- app/components/marty/script_form/client/mode/stex/test.js
-- app/components/marty/script_form/client/mode/tiddlywiki/index.html
-- app/components/marty/script_form/client/mode/tiddlywiki/tiddlywiki.css
-- app/components/marty/script_form/client/mode/tiddlywiki/tiddlywiki.js
-- app/components/marty/script_form/client/mode/tiki/index.html
-- app/components/marty/script_form/client/mode/tiki/tiki.css
-- app/components/marty/script_form/client/mode/tiki/tiki.js
-- app/components/marty/script_form/client/mode/vb/LICENSE.txt
-- app/components/marty/script_form/client/mode/vb/index.html
-- app/components/marty/script_form/client/mode/vb/vb.js
-- app/components/marty/script_form/client/mode/vbscript/index.html
-- app/components/marty/script_form/client/mode/vbscript/vbscript.js
-- app/components/marty/script_form/client/mode/velocity/index.html
-- app/components/marty/script_form/client/mode/velocity/velocity.js
-- app/components/marty/script_form/client/mode/verilog/index.html
-- app/components/marty/script_form/client/mode/verilog/verilog.js
-- app/components/marty/script_form/client/mode/xml/index.html
-- app/components/marty/script_form/client/mode/xml/xml.js
-- app/components/marty/script_form/client/mode/xquery/LICENSE
-- app/components/marty/script_form/client/mode/xquery/index.html
-- app/components/marty/script_form/client/mode/xquery/test/index.html
-- app/components/marty/script_form/client/mode/xquery/test/testBase.js
-- app/components/marty/script_form/client/mode/xquery/test/testEmptySequenceKeyword.js
-- app/components/marty/script_form/client/mode/xquery/test/testMultiAttr.js
-- app/components/marty/script_form/client/mode/xquery/test/testNamespaces.js
-- app/components/marty/script_form/client/mode/xquery/test/testProcessingInstructions.js
-- app/components/marty/script_form/client/mode/xquery/test/testQuotes.js
-- app/components/marty/script_form/client/mode/xquery/xquery.js
-- app/components/marty/script_form/client/mode/yaml/index.html
-- app/components/marty/script_form/client/mode/yaml/yaml.js
-- app/components/marty/script_form/client/theme/ambiance.css
-- app/components/marty/script_form/client/theme/blackboard.css
-- app/components/marty/script_form/client/theme/cobalt.css
-- app/components/marty/script_form/client/theme/eclipse.css
-- app/components/marty/script_form/client/theme/elegant.css
-- app/components/marty/script_form/client/theme/erlang-dark.css
-- app/components/marty/script_form/client/theme/lesser-dark.css
-- app/components/marty/script_form/client/theme/monokai.css
-- app/components/marty/script_form/client/theme/neat.css
-- app/components/marty/script_form/client/theme/night.css
-- app/components/marty/script_form/client/theme/rubyblue.css
-- app/components/marty/script_form/client/theme/vibrant-ink.css
-- app/components/marty/script_form/client/theme/xq-dark.css
-- app/components/marty/script_form/client/util/closetag.js
-- app/components/marty/script_form/client/util/dialog.css
-- app/components/marty/script_form/client/util/dialog.js
-- app/components/marty/script_form/client/util/foldcode.js
-- app/components/marty/script_form/client/util/formatting.js
-- app/components/marty/script_form/client/util/javascript-hint.js
-- app/components/marty/script_form/client/util/loadmode.js
-- app/components/marty/script_form/client/util/match-highlighter.js
-- app/components/marty/script_form/client/util/multiplex.js
-- app/components/marty/script_form/client/util/overlay.js
-- app/components/marty/script_form/client/util/pig-hint.js
-- app/components/marty/script_form/client/util/runmode-standalone.js
-- app/components/marty/script_form/client/util/runmode.js
-- app/components/marty/script_form/client/util/search.js
-- app/components/marty/script_form/client/util/searchcursor.js
-- app/components/marty/script_form/client/util/simple-hint.css
-- app/components/marty/script_form/client/util/simple-hint.js
-- app/components/marty/script_form/client/util/xml-hint.js
+- app/components/marty/script_form/client/script_form.js
 - app/components/marty/script_grid.rb
 - app/components/marty/script_tester.rb
+- app/components/marty/script_tester/client/script_tester.js
 - app/components/marty/scripting.rb
+- app/components/marty/scripting/client/scripting.js
 - app/components/marty/simple_app.rb
 - app/components/marty/simple_app/client/simple_app.js
 - app/components/marty/simple_app/client/statusbar_ext.js
@@ -504,7 +365,6 @@ files:
 - lib/marty/data_exporter.rb
 - lib/marty/data_importer.rb
 - lib/marty/engine.rb
-- lib/marty/javascript/grid_view_in_form.js
 - lib/marty/json_schema.rb
 - lib/marty/logger.rb
 - lib/marty/mcfly_model.rb
@@ -598,6 +458,7 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/delayed_job.rb
 - spec/dummy/config/initializers/inflections.rb