marty 1.2.9 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f9329ef429a6180b90811a7f0f438395a06a51f
-  data.tar.gz: 53eb8d02f9e32fb11f44f8a091a037d7758349b5
+  metadata.gz: 5d9d9f5c0e9c2652723559940f1b2914b383a979
+  data.tar.gz: 2070a22df262364639b039d103fc788e0c98636d
 SHA512:
-  metadata.gz: cb21b47adbdc2a81981d9b1334e6e1e9ab93d989bcaa51c166ed20e99b2b9ead53d0725497fd5e43879d99029255ecfd189adadf0a69367061610a9e426fc675
-  data.tar.gz: 738b139779f6d7a000b210b998a2c485fda2d47ffee0d9e463678fa41498290ccb8662d8af54b9c3b18c7c43ac52fef0e9464ff6de0819ac0c940b6466121629
+  metadata.gz: a7548a3dd1274bbd4e8245cc7fc05186386b936801f22ab1ce3e8b1d9fdf17d4b7ffa096ed9a3d8232f612ee4a55f4c0295a3e27cad07aee8eb9665585547405
+  data.tar.gz: 65a33ee22a28c6aedd262b505f5fc83d12ecf33821fe725f132c8cdfa1b7f1823da0ecb84283ac12696ed3eb5b04cf18a07f60f60e09b41249c43afbcb371b61

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 gem 'delayed_job_active_record'
 gem 'daemons', '~> 1.1.9'
-gem 'rails', '~> 4.2.10'
+gem 'rails', '~> 5.1.4'
 gem 'pg'
 gem 'sqlite3'
 # for signing of aws ec2 requests
@@ -16,17 +16,19 @@ gem 'aws-sigv4', '~> 1.0', '>= 1.0.2'
 
 group :development, :test do
   gem 'pry-rails'
-  gem 'rspec-rails', '~>3.0'
+  gem 'rspec-rails'
   gem 'capybara'
-  gem "selenium-webdriver", '~> 2.53.4'
+  gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
   gem 'timecop'
   gem 'database_cleaner'
+  gem 'rails-controller-testing'
+  gem 'connection_pool'
 
-  gem 'netzke-core'
-  gem 'netzke-basepack'
-  gem 'netzke-testing'
-  gem 'rspec-instafail', require: false
+  # gem 'mcfly', path: File.expand_path('../../mcfly', __FILE__)
+  gem 'mcfly'
+  gem 'netzke', '6.5.0.0'
 
-# gem 'marty_rspec', path: File.expand_path('../../marty_rspec', __FILE__) 
-gem 'marty_rspec'
+  # gem 'marty_rspec', path: File.expand_path('../../marty_rspec', __FILE__)
+  gem 'marty_rspec'
 end

data/Gemfile.lock

@@ -6,10 +6,9 @@ PATH
       coderay
       delorean_lang (~> 0.3.33)
       json-schema
-      mcfly (= 0.0.19)
+      mcfly (= 0.0.20)
       net-ldap (= 0.12.1)
-      netzke-basepack (~> 1.0.0)
-      netzke-core (~> 1.0.0)
+      netzke (= 6.5.0.0)
       pg (~> 0.21)
       rubyzip
       sqlite3
@@ -17,43 +16,48 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
+    actioncable (5.1.5)
+      actionpack (= 5.1.5)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.5)
+      actionview (= 5.1.5)
+      activesupport (= 5.1.5)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
+    actionview (5.1.5)
+      activesupport (= 5.1.5)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
-      globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
-      arel (~> 6.0)
-    activesupport (4.2.10)
+    activejob (5.1.5)
+      activesupport (= 5.1.5)
+      globalid (>= 0.3.6)
+    activemodel (5.1.5)
+      activesupport (= 5.1.5)
+    activerecord (5.1.5)
+      activemodel (= 5.1.5)
+      activesupport (= 5.1.5)
+      arel (~> 8.0)
+    activesupport (5.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    arel (6.0.4)
+    archive-zip (0.7.0)
+      io-like (~> 0.3.0)
+    arel (8.0.0)
     aws-sigv4 (1.0.2)
     axlsx (3.0.0.pre)
       htmlentities (~> 4.3, >= 4.3.4)
@@ -70,12 +74,16 @@ GEM
       xpath (>= 2.0, < 4.0)
     childprocess (0.8.0)
       ffi (~> 1.0, >= 1.0.11)
+    chromedriver-helper (1.1.0)
+      archive-zip (~> 0.7.0)
+      nokogiri (~> 1.6)
     coderay (1.1.2)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
+    connection_pool (2.2.1)
     crass (1.0.3)
     daemons (1.1.9)
     database_cleaner (1.6.2)
@@ -84,11 +92,11 @@ GEM
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
-    delorean_lang (0.3.36)
+    delorean_lang (0.3.37)
       activerecord (>= 3.2)
       treetop (~> 1.5)
     diff-lcs (1.3)
-    erubis (2.7.0)
+    erubi (1.7.1)
     execjs (2.7.0)
     ffi (1.9.23)
     globalid (0.4.1)
@@ -96,16 +104,17 @@ GEM
     htmlentities (4.3.4)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
+    io-like (0.3.0)
     json-schema (2.8.0)
       addressable (>= 2.4)
-    loofah (2.2.0)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
     marty_rspec (0.1)
       rspec-by
-    mcfly (0.0.19)
+    mcfly (0.0.20)
       delorean_lang (~> 0.1)
       pg (~> 0.17)
     method_source (0.9.0)
@@ -115,13 +124,18 @@ GEM
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     net-ldap (0.12.1)
-    netzke-basepack (1.0.1.0)
-    netzke-core (1.0.1.0)
+    netzke (6.5.0.0)
+      netzke-basepack (= 6.5.0.0)
+      netzke-core (= 6.5.0.0)
+      netzke-testing (= 6.5.0.0)
+    netzke-basepack (6.5.0.0)
+    netzke-core (6.5.0.0)
       execjs
       mime-types (< 3)
       uglifier
     netzke-testing (6.5.0.0)
       coffee-script
+    nio4r (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     pg (0.21.0)
@@ -132,38 +146,37 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.0.2)
-    rack (1.6.9)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.10)
-      actionmailer (= 4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
-      activemodel (= 4.2.10)
-      activerecord (= 4.2.10)
-      activesupport (= 4.2.10)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.10)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.10)
-      actionpack (= 4.2.10)
-      activesupport (= 4.2.10)
+    rack (2.0.4)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.5)
+      actioncable (= 5.1.5)
+      actionmailer (= 5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
+      activemodel (= 5.1.5)
+      activerecord (= 5.1.5)
+      activesupport (= 5.1.5)
+      bundler (>= 1.3.0)
+      railties (= 5.1.5)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.2)
+      actionpack (~> 5.x, >= 5.0.1)
+      actionview (~> 5.x, >= 5.0.1)
+      activesupport (~> 5.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.1.5)
+      actionpack (= 5.1.5)
+      activesupport (= 5.1.5)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
+    rake (12.3.1)
     rspec-by (0.0.7)
       rspec-core (>= 3)
     rspec-core (3.7.1)
@@ -171,8 +184,6 @@ GEM
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
-    rspec-instafail (1.0.0)
-      rspec
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
@@ -186,10 +197,9 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
     rubyzip (1.2.1)
-    selenium-webdriver (2.53.4)
+    selenium-webdriver (3.8.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
-      websocket (~> 1.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -201,13 +211,15 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    treetop (1.6.9)
+    treetop (1.6.10)
       polyglot (~> 0.3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.6)
       execjs (>= 0.3.0, < 3)
-    websocket (1.2.5)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
     xpath (3.0.0)
       nokogiri (~> 1.8)
 
@@ -217,20 +229,21 @@ PLATFORMS
 DEPENDENCIES
   aws-sigv4 (~> 1.0, >= 1.0.2)
   capybara
+  chromedriver-helper
+  connection_pool
   daemons (~> 1.1.9)
   database_cleaner
   delayed_job_active_record
   marty!
   marty_rspec
-  netzke-basepack
-  netzke-core
-  netzke-testing
+  mcfly
+  netzke (= 6.5.0.0)
   pg
   pry-rails
-  rails (~> 4.2.10)
-  rspec-instafail
-  rspec-rails (~> 3.0)
-  selenium-webdriver (~> 2.53.4)
+  rails (~> 5.1.4)
+  rails-controller-testing
+  rspec-rails
+  selenium-webdriver
   sqlite3
   timecop
 

data/app/components/marty/data_grid_view.rb

@@ -12,7 +12,7 @@ module Marty; class DataGridView < McflyGridPanel
 
     javascript = l(<<-JS)
     function() {
-       var sel = this.getSelectionModel().selected.first();
+       var sel = this.getSelectionModel().getSelection()[0];
        var record_id = sel && sel.getId();
        this.server.showGrid({record_id: record_id,
                             data_grid: "#{dg}",

data/app/components/marty/main_auth_app.rb

@@ -31,7 +31,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   def icon_hack(name)
     # There's a Netzke bug whereby, using an icon name in a hash
     # doesn't generate a proper URL.
-    "#{Netzke::Core.ext_uri}/../images/icons/#{name}.png"
+    "#{Netzke::Core.ext_uri}/../icons/#{name}.png"
   end
 
   def posting_menu

data/app/components/marty/mcfly_grid_panel/client/dup_in_form.js

@@ -2,7 +2,7 @@
     // copied from basepack grid's onEditInForm
     netzkeOnDupInForm: function(){
         var selModel = this.getSelectionModel();
-        var recordId = selModel.selected.first().getId();
+        var recordId = selModel.getSelection()[0].getId();
         this.netzkeLoadComponent("edit_window", {
             title: "Duplicate in Form",
             serverConfig: {record_id: recordId},

data/app/components/marty/posting_grid.rb

@@ -35,7 +35,7 @@ class Marty::PostingGrid < Marty::Grid
 
     c.detail = l(<<-JS)
     function() {
-       record_id = this.getSelectionModel().selected.first().getId();
+       record_id = this.getSelectionModel().getSelection()[0].getId();
        this.server.detail({record_id: record_id});
     }
     JS

data/app/components/marty/promise_view.rb

@@ -82,7 +82,7 @@ class Marty::PromiseView < Netzke::Tree::Base
 
     config.netzke_on_download = l(<<-JS)
     function() {
-       var jid = this.getSelectionModel().selected.first().getId();
+       var jid = this.getSelectionModel().getSelection()[0].getId();
        // FIXME: seems pretty hacky
        window.location = "#{Marty::Util.marty_path}/job/download?job_id=" + jid;
     }

data/app/components/marty/simple_app.rb

@@ -32,7 +32,7 @@ class Marty::SimpleApp < Netzke::Base
   client_class do |c|
     c.extend = "Ext.container.Viewport"
     c.layout = :border
-    c.require Netzke::Core.ext_path.join("examples", "ux/statusbar/StatusBar.js"), :statusbar_ext
+    c.require Netzke::Core.ext_path.join("packages/ux/classic/src/statusbar/StatusBar.js"), :statusbar_ext
     c.include :simple_app
   end
 

data/app/controllers/marty/application_controller.rb

@@ -11,7 +11,7 @@ class Marty::ApplicationController < ActionController::Base
     cookies.delete(:autologin)
   end
 
-  before_filter :session_expiration,
+  before_action :session_expiration,
   :user_setup
 
   def get_conf
@@ -99,7 +99,7 @@ class Marty::ApplicationController < ActionController::Base
   def logout_user
     if Marty::User.current
       cookies.delete :autologin
-      Marty::Token.delete_all(["user_id = ?", Marty::User.current.id]) unless
+      Marty::Token.where(user_id: Marty::User.current.id).delete_all unless
         Marty::Util.db_in_recovery?
       self.set_user(nil)
     end

data/app/controllers/marty/diagnostic/controller.rb

@@ -1,10 +1,6 @@
 module Marty::Diagnostic; class Controller < ActionController::Base
   def self.inherited(klass)
-    namespace = begin
-                  klass.name.deconstantize.split('::')[0]
-                rescue
-                  ''
-                end
+    namespace = klass.name.deconstantize.split('::')[0] rescue ''
     Reporter.namespaces.unshift(namespace)
     super
   end

data/app/models/marty/api_auth.rb

@@ -9,12 +9,14 @@ class Marty::ApiAuth < Marty::Base
 
   class ApiAuthValidator < ActiveModel::Validator
     def validate(api)
-      api.errors[:base] =
-        "API Key length must be #{KEY_SIZE*2}" if
+      api.errors.add(
+        :base,
+        "API Key length must be #{KEY_SIZE*2}") if
         api.api_key && api.api_key.length != KEY_SIZE*2
 
-      api.errors[:base] =
-        "Script Name must reference a valid script" if
+        api.errors.add(
+          :base,
+          "Script Name must reference a valid script") if
         Marty::Script.find_script(api.script_name, nil).nil?
     end
   end