marty 0.5.41 → 1.0.0

data/app/components/marty/tag_grid.rb

@@ -10,42 +10,36 @@ class Marty::TagGrid < Marty::Grid
     c.model        = "Marty::Tag"
     c.multi_select = false
 
-    c.columns ||= [:name, :created_dt, :user__name, :comment]
+    c.attributes ||= [:name, :created_dt, :user__name, :comment]
 
-    c.data_store.sorters = {
-      property: :created_dt,
-      direction: 'DESC',
-    }
+    c.store_config.merge!({sorters: [{property: :created_dt,
+                                      direction: 'DESC'}]})
   end
 
-  endpoint :add_window__add_form__netzke_submit do |params, this|
+  endpoint :add_window__add_form__submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
 
-    return this.netzke_feedback("Permission Denied") if
-      config[:prohibit_create]
+    return client.netzke_notify("Permission Denied") if
+      !config[:permissions][:create]
 
     # FIXME: disallow tag creation when no script has been modified?
 
     tag = Marty::Tag.do_create(nil, data["comment"])
 
     if tag.valid?
-      this.success = true
-      this.on_submit_success
+      client.success = true
+      client.netzke_on_submit_success
       return
     end
 
-    data_adapter.errors_array(tag).each do |error|
-      flash :error => error
-    end
-
-    this.netzke_feedback(@flash)
+    client.netzke_notify(model_adapter.errors_array(tag).join("\n"))
   end
 
   action :add_in_form do |a|
     a.text     = I18n.t("tag_grid.new")
     a.tooltip  = I18n.t("tag_grid.new")
     a.icon     = :time_add
-    a.disabled = config[:prohibit_create]
+    a.disabled = !config[:permissions][:create]
   end
 
   def default_bbar
@@ -56,24 +50,24 @@ class Marty::TagGrid < Marty::Grid
     []
   end
 
-  def default_fields_for_forms
+  def default_form_items
     [:comment]
   end
 
-  column :name do |c|
+  attribute :name do |c|
   end
 
-  column :created_dt do |c|
+  attribute :created_dt do |c|
     c.text   = "Date/Time"
     c.format = "Y-m-d H:i"
     c.hidden = true
   end
 
-  column :user__name do |c|
+  attribute :user__name do |c|
     c.width  = 100
   end
 
-  column :comment do |c|
+  attribute :comment do |c|
     c.width  = 100
     c.flex   = 1
   end

data/app/components/marty/user_view.rb

@@ -21,17 +21,13 @@ class Marty::UserView < Marty::Grid
 
     c.title ||= I18n.t('users', default: "Users")
     c.model                  = "Marty::User"
-    c.enable_extended_search = false
-    c.enable_edit_inline     = false
+    c.editing                = :in_form
+    c.paging                 = :pagination
     c.multi_select           = false
-
-    c.columns ||= self.class.user_columns
-
-    c.data_store.sorters = {
-      property: :login,
-      direction: 'ASC',
-    } if c.columns.include?(:login)
-
+    c.attributes ||= self.class.user_columns
+    c.store_config.merge!({sorters: [{property: :login,
+                                 direction: 'ASC',
+                                }]}) if c.attributes.include?(:login)
     c.scope = ->(arel) { arel.includes(:roles) }
   end
 
@@ -68,116 +64,104 @@ class Marty::UserView < Marty::Grid
   # override the add_in_form and edit_in_form endpoint. User creation/update
   # needs to use the create_edit_user method.
 
-  endpoint :add_window__add_form__netzke_submit do |params, this|
+  endpoint :add_window__add_form__submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
 
     data["id"] = nil
 
     unless self.class.can_perform_action?(:create)
-      this.netzke_feedback "Permission Denied"
+      client.netzke_notify "Permission Denied"
       return
     end
 
     user = self.class.create_edit_user(data)
     if user.valid?
-      this.success = true
-      this.on_submit_success
+      client.success = true
+      client.netzke_on_submit_success
     else
-      data_adapter.errors_array(user).each do |error|
-        flash :error => error
-      end
-      this.netzke_feedback(@flash)
+      client.netzke_notify(model_adapter.errors_array(user).join("\n"))
     end
   end
 
-  endpoint :edit_window__edit_form__netzke_submit do |params, this|
+  endpoint :edit_window__edit_form__submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
     unless self.class.can_perform_action?(:update)
-      this.netzke_feedback "Permission Denied"
+      client.netzke_notify "Permission Denied"
       return
     end
 
     user = self.class.create_edit_user(data)
     if user.valid?
-      this.success = true
-      this.on_submit_success
+      client.success = true
+      client.netzke_on_submit_success
     else
-      data_adapter.errors_array(user).each do |error|
-        flash :error => error
-      end
-      this.netzke_feedback(@flash)
+      client.netzke_notify(model_adapter.errors_array(user).join("\n"))
     end
   end
 
-  action :add_in_form do |a|
+  action :add do |a|
+    super(a)
     a.text     = I18n.t("user_grid.new")
     a.tooltip  = I18n.t("user_grid.new")
     a.icon     = :user_add
-    a.disabled = !self.class.can_perform_action?(:create)
   end
 
-  action :edit_in_form do |a|
-    a.disabled = !self.class.can_perform_action?(:update)
+  action :edit do |a|
+    super(a)
     a.icon     = :user_edit
   end
 
-  action :del do |a|
+  action :delete do |a|
+    super(a)
     a.icon     = :user_delete
   end
 
-  def default_bbar
-    [:add_in_form, :edit_in_form, :del]
-  end
-
   def default_context_menu
     []
   end
 
-  column :login do |c|
+  attribute :login do |c|
     c.width = 100
-    c.text  = I18n.t("user_grid.login")
+    c.label  = I18n.t("user_grid.login")
   end
 
-  column :firstname do |c|
+  attribute :firstname do |c|
     c.width = 100
-    c.text  = I18n.t("user_grid.firstname")
+    c.label  = I18n.t("user_grid.firstname")
   end
 
-  column :lastname do |c|
+  attribute :lastname do |c|
     c.width = 100
-    c.text  = I18n.t("user_grid.lastname")
+    c.label  = I18n.t("user_grid.lastname")
   end
 
-  column :active do |c|
+  attribute :active do |c|
     c.width = 60
-    c.text  = I18n.t("user_grid.active")
+    c.label  = I18n.t("user_grid.active")
   end
 
-  column :roles do |c|
+  attribute :roles do |c|
     c.width  = 100
     c.flex   = 1
-    c.text   = I18n.t("user_grid.roles")
-    c.editor = {
-      trigger_action: :all,
-      name: "roles",
-      attr_type: :string,
-      xtype: :combo,
-      store: Marty::Role.pluck(:name).map {|n| I18n.t("roles.#{n}")}.sort,
-      empty_text: I18n.t("user_grid.select_roles"),
-      multi_select: true,
-    }
+    c.label   = I18n.t("user_grid.roles")
+    c.type   = :string,
 
     c.getter = lambda do |r|
       r.roles.map { |ur| I18n.t("roles.#{ur.name}") }.sort
     end
+    c.editor_config = { multi_select: true,
+                        empty_text: I18n.t("user_grid.select_roles"),
+                        store: Marty::Role.pluck(:name).map {
+                          |n| I18n.t("roles.#{n}")}.sort,
+                        type: :string,
+                        xtype: :combo}
   end
 
-  column :created_dt do |c|
-    c.text      = I18n.t("user_grid.created_dt")
+  attribute :created_dt do |c|
+    c.label      = I18n.t("user_grid.created_dt")
     c.format    = "Y-m-d H:i"
     c.read_only = true
   end
-
 end
 
 UserView = Marty::UserView

data/lib/marty/monkey.rb

@@ -145,7 +145,7 @@ module Netzke::Basepack::DataAdapters
         relation = relation.includes(assoc.to_sym).references(assoc.to_sym) if method
       end
 
-      @model_class.const_defined?(:LAZY_LOADED) ? relation.unscoped.count :
+      @model.const_defined?(:LAZY_LOADED) ? relation.unscoped.count :
         relation.count
     end
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.41"
+  VERSION = "1.0.0"
 end

data/marty.gemspec

@@ -28,8 +28,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "pg", "~> 0.17"
 
-  s.add_dependency 'netzke-core', '~> 0.12.2'
-  s.add_dependency 'netzke-basepack', '~> 0.12.6'
+  s.add_dependency 'netzke-core', '~> 1.0.0'
+  s.add_dependency 'netzke-basepack', '~> 1.0.0'
+  s.add_development_dependency 'netzke-testing', '~> 1.0.0'
 
   s.add_dependency 'axlsx', '2.1.0pre'
 

data/spec/dummy/app/assets/client/application.js

@@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/spec/features/scripting_spec.rb

@@ -345,6 +345,23 @@ feature 'under Applications menu, Scripting workflows', js: true do
     end
   end
 
+  it 'prevents non-dev from deleting' do
+    log_in_as('viewer1')
+    go_to_scripting
+
+    script_grid = netzke_find('script_grid')
+    and_by 'delete script' do
+      script_grid.select_row(1)
+      press('Delete Script')
+      find(:xpath, "//div[text()='Confirmation']", wait: 5)
+      press('Yes')
+    end
+
+    and_by 'script is gone' do
+      expect(find(:msg)).to have_content 'Permission Denied'
+    end
+  end
+
   it 'only allows delete on DEV tag' do
     log_in_as('dev1')
     go_to_scripting

data/spec/features/user_view_spec.rb

@@ -66,7 +66,7 @@ feature 'under Sytem menu, User Management worflows', js: true do
       wait_for_ajax
       expect(user_view.row_count).to eq 2
       user_view.select_row(2)
-      press('Edit in form')
+      press('Edit')
 
       within(:gridpanel, 'edit_window', match: :first) do
         fill_in('Login', with: 'new_login')
@@ -113,11 +113,13 @@ feature 'under Sytem menu, User Management worflows', js: true do
     it 'user manager has access' do
       log_in_as('user_manager1')
       go_to_user_view
+      user_view = netzke_find('user_view')
       by 'check buttons' do
         find(:btn, 'New User', match: :first)
         zoom_out
+        user_view.select_row(1)
         expect(btn_disabled?('New User')).to be_falsy
-        expect(btn_disabled?('Edit in form')).to be_falsy
+        expect(btn_disabled?('Edit')).to be_falsy
         expect(btn_disabled?('Delete')).to be_falsy
       end
     end
@@ -125,10 +127,12 @@ feature 'under Sytem menu, User Management worflows', js: true do
     it 'admin has access' do
       log_in_as('admin1')
       go_to_user_view
+      user_view = netzke_find('user_view')
       by 'check buttons' do
         find(:btn, 'New User', match: :first)
+        user_view.select_row(1)
         expect(btn_disabled?('New User')).to be_falsy
-        expect(btn_disabled?('Edit in form')).to be_falsy
+        expect(btn_disabled?('Edit')).to be_falsy
         expect(btn_disabled?('Delete')).to be_falsy
       end
     end
@@ -136,30 +140,26 @@ feature 'under Sytem menu, User Management worflows', js: true do
     it 'viewer denied access' do
       log_in_as('viewer1')
       go_to_user_view_backdoor
+
       user_view = netzke_find('user_view')
       by 'check buttons' do
-        find(:btn, 'New User', match: :first)
-        #selection needed to make delete button disappear
-        wait_for_ajax
         user_view.select_row(1)
-        expect(btn_disabled?('New User')).to be_truthy
-        expect(btn_disabled?('Edit in form')).to be_truthy
-        expect(btn_disabled?('Delete')).to be_truthy
+        expect(page).not_to have_content('New User')
+        expect(page).not_to have_content('Edit')
+        expect(page).not_to have_content('Delete')
       end
     end
 
     it 'developer denied access' do
       log_in_as('dev1')
       go_to_user_view_backdoor
+
       user_view = netzke_find('user_view')
       by 'check buttons' do
-        find(:btn, 'New User', match: :first)
-        #selection needed to make delete button disappear
-        wait_for_ajax
         user_view.select_row(1)
-        expect(btn_disabled?('New User')).to be_truthy
-        expect(btn_disabled?('Edit in form')).to be_truthy
-        expect(btn_disabled?('Delete')).to be_truthy
+        expect(page).not_to have_content('New User')
+        expect(page).not_to have_content('Edit')
+        expect(page).not_to have_content('Delete')
       end
     end
   end

data/spec/spec_helper.rb

@@ -29,6 +29,15 @@ class ActiveRecord::Base
   end
 end
 
+Capybara.register_driver :selenium do |app|
+  client = Selenium::WebDriver::Remote::Http::Default.new
+  profile = Selenium::WebDriver::Firefox::Profile.new
+  profile.load_no_focus_lib = true
+  Capybara::Selenium::Driver.new(app, :profile => profile,
+                                 :http_client => client)
+end
+
+
 ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.41
+  version: 1.0.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -36,28 +36,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: netzke-basepack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.6
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.6
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: netzke-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: axlsx
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +176,7 @@ files:
 - app/assets/stylesheets/marty/diagnostic.css
 - app/components/marty/api_auth_view.rb
 - app/components/marty/auth_app.rb
-- app/components/marty/auth_app/javascripts/auth_app.js
+- app/components/marty/auth_app/client/auth_app.js
 - app/components/marty/config_view.rb
 - app/components/marty/extras/layout.rb
 - app/components/marty/extras/misc.rb
@@ -179,180 +193,180 @@ files:
 - app/components/marty/posting_grid.rb
 - app/components/marty/posting_window.rb
 - app/components/marty/promise_view.rb
-- app/components/marty/promise_view/stylesheets/promise_view.css
+- app/components/marty/promise_view/client/promise_view.css
 - app/components/marty/report_form.rb
 - app/components/marty/report_select.rb
 - app/components/marty/reporting.rb
 - app/components/marty/script_form.rb
-- app/components/marty/script_form/javascripts/Ext.ux.form.field.CodeMirror.js
-- app/components/marty/script_form/javascripts/codemirror.js
-- app/components/marty/script_form/javascripts/mode/clike/clike.js
-- app/components/marty/script_form/javascripts/mode/clike/index.html
-- app/components/marty/script_form/javascripts/mode/clike/scala.html
-- app/components/marty/script_form/javascripts/mode/clojure/clojure.js
-- app/components/marty/script_form/javascripts/mode/clojure/index.html
-- app/components/marty/script_form/javascripts/mode/coffeescript/LICENSE
-- app/components/marty/script_form/javascripts/mode/coffeescript/coffeescript.js
-- app/components/marty/script_form/javascripts/mode/coffeescript/index.html
-- app/components/marty/script_form/javascripts/mode/commonlisp/commonlisp.js
-- app/components/marty/script_form/javascripts/mode/commonlisp/index.html
-- app/components/marty/script_form/javascripts/mode/css/css.js
-- app/components/marty/script_form/javascripts/mode/css/index.html
-- app/components/marty/script_form/javascripts/mode/css/test.js
-- app/components/marty/script_form/javascripts/mode/delorean/delorean.js
-- app/components/marty/script_form/javascripts/mode/diff/diff.js
-- app/components/marty/script_form/javascripts/mode/diff/index.html
-- app/components/marty/script_form/javascripts/mode/ecl/ecl.js
-- app/components/marty/script_form/javascripts/mode/ecl/index.html
-- app/components/marty/script_form/javascripts/mode/erlang/erlang.js
-- app/components/marty/script_form/javascripts/mode/erlang/index.html
-- app/components/marty/script_form/javascripts/mode/gfm/gfm.js
-- app/components/marty/script_form/javascripts/mode/gfm/index.html
-- app/components/marty/script_form/javascripts/mode/go/go.js
-- app/components/marty/script_form/javascripts/mode/go/index.html
-- app/components/marty/script_form/javascripts/mode/groovy/groovy.js
-- app/components/marty/script_form/javascripts/mode/groovy/index.html
-- app/components/marty/script_form/javascripts/mode/haskell/haskell.js
-- app/components/marty/script_form/javascripts/mode/haskell/index.html
-- app/components/marty/script_form/javascripts/mode/haxe/haxe.js
-- app/components/marty/script_form/javascripts/mode/haxe/index.html
-- app/components/marty/script_form/javascripts/mode/htmlembedded/htmlembedded.js
-- app/components/marty/script_form/javascripts/mode/htmlembedded/index.html
-- app/components/marty/script_form/javascripts/mode/htmlmixed/htmlmixed.js
-- app/components/marty/script_form/javascripts/mode/htmlmixed/index.html
-- app/components/marty/script_form/javascripts/mode/javascript/index.html
-- app/components/marty/script_form/javascripts/mode/javascript/javascript.js
-- app/components/marty/script_form/javascripts/mode/jinja2/index.html
-- app/components/marty/script_form/javascripts/mode/jinja2/jinja2.js
-- app/components/marty/script_form/javascripts/mode/less/index.html
-- app/components/marty/script_form/javascripts/mode/less/less.js
-- app/components/marty/script_form/javascripts/mode/lua/index.html
-- app/components/marty/script_form/javascripts/mode/lua/lua.js
-- app/components/marty/script_form/javascripts/mode/markdown/index.html
-- app/components/marty/script_form/javascripts/mode/markdown/markdown.js
-- app/components/marty/script_form/javascripts/mode/markdown/test.js
-- app/components/marty/script_form/javascripts/mode/mysql/index.html
-- app/components/marty/script_form/javascripts/mode/mysql/mysql.js
-- app/components/marty/script_form/javascripts/mode/ntriples/index.html
-- app/components/marty/script_form/javascripts/mode/ntriples/ntriples.js
-- app/components/marty/script_form/javascripts/mode/ocaml/index.html
-- app/components/marty/script_form/javascripts/mode/ocaml/ocaml.js
-- app/components/marty/script_form/javascripts/mode/pascal/LICENSE
-- app/components/marty/script_form/javascripts/mode/pascal/index.html
-- app/components/marty/script_form/javascripts/mode/pascal/pascal.js
-- app/components/marty/script_form/javascripts/mode/perl/LICENSE
-- app/components/marty/script_form/javascripts/mode/perl/index.html
-- app/components/marty/script_form/javascripts/mode/perl/perl.js
-- app/components/marty/script_form/javascripts/mode/php/index.html
-- app/components/marty/script_form/javascripts/mode/php/php.js
-- app/components/marty/script_form/javascripts/mode/pig/index.html
-- app/components/marty/script_form/javascripts/mode/pig/pig.js
-- app/components/marty/script_form/javascripts/mode/plsql/index.html
-- app/components/marty/script_form/javascripts/mode/plsql/plsql.js
-- app/components/marty/script_form/javascripts/mode/properties/index.html
-- app/components/marty/script_form/javascripts/mode/properties/properties.js
-- app/components/marty/script_form/javascripts/mode/python/LICENSE.txt
-- app/components/marty/script_form/javascripts/mode/python/index.html
-- app/components/marty/script_form/javascripts/mode/python/python.js
-- app/components/marty/script_form/javascripts/mode/r/LICENSE
-- app/components/marty/script_form/javascripts/mode/r/index.html
-- app/components/marty/script_form/javascripts/mode/r/r.js
-- app/components/marty/script_form/javascripts/mode/rpm/changes/changes.js
-- app/components/marty/script_form/javascripts/mode/rpm/changes/index.html
-- app/components/marty/script_form/javascripts/mode/rpm/spec/index.html
-- app/components/marty/script_form/javascripts/mode/rpm/spec/spec.css
-- app/components/marty/script_form/javascripts/mode/rpm/spec/spec.js
-- app/components/marty/script_form/javascripts/mode/rst/index.html
-- app/components/marty/script_form/javascripts/mode/rst/rst.js
-- app/components/marty/script_form/javascripts/mode/ruby/LICENSE
-- app/components/marty/script_form/javascripts/mode/ruby/index.html
-- app/components/marty/script_form/javascripts/mode/ruby/ruby.js
-- app/components/marty/script_form/javascripts/mode/rust/index.html
-- app/components/marty/script_form/javascripts/mode/rust/rust.js
-- app/components/marty/script_form/javascripts/mode/scheme/index.html
-- app/components/marty/script_form/javascripts/mode/scheme/scheme.js
-- app/components/marty/script_form/javascripts/mode/shell/index.html
-- app/components/marty/script_form/javascripts/mode/shell/shell.js
-- app/components/marty/script_form/javascripts/mode/sieve/LICENSE
-- app/components/marty/script_form/javascripts/mode/sieve/index.html
-- app/components/marty/script_form/javascripts/mode/sieve/sieve.js
-- app/components/marty/script_form/javascripts/mode/smalltalk/index.html
-- app/components/marty/script_form/javascripts/mode/smalltalk/smalltalk.js
-- app/components/marty/script_form/javascripts/mode/smarty/index.html
-- app/components/marty/script_form/javascripts/mode/smarty/smarty.js
-- app/components/marty/script_form/javascripts/mode/sparql/index.html
-- app/components/marty/script_form/javascripts/mode/sparql/sparql.js
-- app/components/marty/script_form/javascripts/mode/stex/index.html
-- app/components/marty/script_form/javascripts/mode/stex/stex.js
-- app/components/marty/script_form/javascripts/mode/stex/test.js
-- app/components/marty/script_form/javascripts/mode/tiddlywiki/index.html
-- app/components/marty/script_form/javascripts/mode/tiddlywiki/tiddlywiki.css
-- app/components/marty/script_form/javascripts/mode/tiddlywiki/tiddlywiki.js
-- app/components/marty/script_form/javascripts/mode/tiki/index.html
-- app/components/marty/script_form/javascripts/mode/tiki/tiki.css
-- app/components/marty/script_form/javascripts/mode/tiki/tiki.js
-- app/components/marty/script_form/javascripts/mode/vb/LICENSE.txt
-- app/components/marty/script_form/javascripts/mode/vb/index.html
-- app/components/marty/script_form/javascripts/mode/vb/vb.js
-- app/components/marty/script_form/javascripts/mode/vbscript/index.html
-- app/components/marty/script_form/javascripts/mode/vbscript/vbscript.js
-- app/components/marty/script_form/javascripts/mode/velocity/index.html
-- app/components/marty/script_form/javascripts/mode/velocity/velocity.js
-- app/components/marty/script_form/javascripts/mode/verilog/index.html
-- app/components/marty/script_form/javascripts/mode/verilog/verilog.js
-- app/components/marty/script_form/javascripts/mode/xml/index.html
-- app/components/marty/script_form/javascripts/mode/xml/xml.js
-- app/components/marty/script_form/javascripts/mode/xquery/LICENSE
-- app/components/marty/script_form/javascripts/mode/xquery/index.html
-- app/components/marty/script_form/javascripts/mode/xquery/test/index.html
-- app/components/marty/script_form/javascripts/mode/xquery/test/testBase.js
-- app/components/marty/script_form/javascripts/mode/xquery/test/testEmptySequenceKeyword.js
-- app/components/marty/script_form/javascripts/mode/xquery/test/testMultiAttr.js
-- app/components/marty/script_form/javascripts/mode/xquery/test/testNamespaces.js
-- app/components/marty/script_form/javascripts/mode/xquery/test/testProcessingInstructions.js
-- app/components/marty/script_form/javascripts/mode/xquery/test/testQuotes.js
-- app/components/marty/script_form/javascripts/mode/xquery/xquery.js
-- app/components/marty/script_form/javascripts/mode/yaml/index.html
-- app/components/marty/script_form/javascripts/mode/yaml/yaml.js
-- app/components/marty/script_form/javascripts/util/closetag.js
-- app/components/marty/script_form/javascripts/util/dialog.css
-- app/components/marty/script_form/javascripts/util/dialog.js
-- app/components/marty/script_form/javascripts/util/foldcode.js
-- app/components/marty/script_form/javascripts/util/formatting.js
-- app/components/marty/script_form/javascripts/util/javascript-hint.js
-- app/components/marty/script_form/javascripts/util/loadmode.js
-- app/components/marty/script_form/javascripts/util/match-highlighter.js
-- app/components/marty/script_form/javascripts/util/multiplex.js
-- app/components/marty/script_form/javascripts/util/overlay.js
-- app/components/marty/script_form/javascripts/util/pig-hint.js
-- app/components/marty/script_form/javascripts/util/runmode-standalone.js
-- app/components/marty/script_form/javascripts/util/runmode.js
-- app/components/marty/script_form/javascripts/util/search.js
-- app/components/marty/script_form/javascripts/util/searchcursor.js
-- app/components/marty/script_form/javascripts/util/simple-hint.css
-- app/components/marty/script_form/javascripts/util/simple-hint.js
-- app/components/marty/script_form/javascripts/util/xml-hint.js
-- app/components/marty/script_form/stylesheets/codemirror.css
-- app/components/marty/script_form/stylesheets/delorean.css
-- app/components/marty/script_form/stylesheets/theme/ambiance.css
-- app/components/marty/script_form/stylesheets/theme/blackboard.css
-- app/components/marty/script_form/stylesheets/theme/cobalt.css
-- app/components/marty/script_form/stylesheets/theme/eclipse.css
-- app/components/marty/script_form/stylesheets/theme/elegant.css
-- app/components/marty/script_form/stylesheets/theme/erlang-dark.css
-- app/components/marty/script_form/stylesheets/theme/lesser-dark.css
-- app/components/marty/script_form/stylesheets/theme/monokai.css
-- app/components/marty/script_form/stylesheets/theme/neat.css
-- app/components/marty/script_form/stylesheets/theme/night.css
-- app/components/marty/script_form/stylesheets/theme/rubyblue.css
-- app/components/marty/script_form/stylesheets/theme/vibrant-ink.css
-- app/components/marty/script_form/stylesheets/theme/xq-dark.css
+- 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_grid.rb
 - app/components/marty/script_tester.rb
 - app/components/marty/scripting.rb
 - app/components/marty/simple_app.rb
-- app/components/marty/simple_app/javascripts/simple_app.js
-- app/components/marty/simple_app/javascripts/statusbar_ext.js
+- app/components/marty/simple_app/client/simple_app.js
+- app/components/marty/simple_app/client/statusbar_ext.js
 - app/components/marty/tag_grid.rb
 - app/components/marty/user_view.rb
 - app/controllers/marty/application_controller.rb
@@ -451,7 +465,8 @@ files:
 - spec/controllers/rpc_import_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
-- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/client/application.css
+- spec/dummy/app/assets/client/application.js
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/components_controller.rb
 - spec/dummy/app/helpers/application_helper.rb