marty 1.0.39 → 1.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d5f574966052ae97f6cd32ce6de46d6ba0349c
-  data.tar.gz: 2d168acee2a87a80112c67a1c9bdb312f5b6025d
+  metadata.gz: deedaa5ae6db6c27c680a5cdb6707de3a5f4f06a
+  data.tar.gz: 7c86319dca00f3dc47356642bfa68d955472e8be
 SHA512:
-  metadata.gz: 2406f23f35850e9d905afb94c89242879a9f0cd86d481d07d1b134c41cc5e9f1060493ae9f613ffbbdb3adfcac97790627ced29479dc37481000bf5e4dbdb325
-  data.tar.gz: d7085ca103f7b0401389dd8b990caa33ff72f8543d311fef60dd05401103afb4562a35fe03013fa7490b58dc325916a6c6bb0f632eea2070efbe99c5723f86ad
+  metadata.gz: 6abef04a5d54ec802bc3d0019a68b90b706a9b49aa2a5f7beecac8b195be8e71d8b487d5d8336ddc60892472b947042c342c57e8828c768cdb7f8292a3788304
+  data.tar.gz: 892af85ab6b7af8671b1de303e07317d5db34fc8ce65e10d42b4e919ff5b98c71b27e068deb709b961218578950670c5a84881bd906b9cc512d2bbd5ac65b855

data/Gemfile.lock

@@ -175,9 +175,10 @@ GEM
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
     rubyzip (1.1.7)
-    selenium-webdriver (3.5.2)
+    selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
+      websocket (~> 1.0)
     slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -196,6 +197,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
+    websocket (1.2.4)
     xpath (2.1.0)
       nokogiri (~> 1.3)
 

data/app/components/marty/main_auth_app.rb

@@ -432,7 +432,6 @@ class Marty::MainAuthApp < Marty::AuthApp
     c.netzke_on_bg_stop = l(<<-JS)
     function(params) {
        var me = this;
-       me.showLoadmask('Stopping delayed job...');
        Ext.Msg.show({
          title: 'Stop Delayed Jobs',
          msg: 'Enter STOP and press OK to force a stop of delayed_job',
@@ -440,7 +439,10 @@ class Marty::MainAuthApp < Marty::AuthApp
          buttons: Ext.Msg.OKCANCEL,
          prompt: true,
          fn: function (btn, value) {
-           btn == "ok" && value == "STOP" && me.server.bgStop({});
+           if (btn == "ok" && value == "STOP") {
+             me.showLoadmask('Stopping delayed job...');
+             me.server.bgStop({});
+           }
          }
        });
     }
@@ -449,7 +451,6 @@ class Marty::MainAuthApp < Marty::AuthApp
     c.netzke_on_bg_restart = l(<<-JS)
     function(params) {
        var me = this;
-       me.showLoadmask('Restarting delayed job...');
        Ext.Msg.show({
          title: 'Restart Delayed Jobs',
          msg: 'Enter RESTART and press OK to force a restart of delayed_job',
@@ -457,7 +458,10 @@ class Marty::MainAuthApp < Marty::AuthApp
          buttons: Ext.Msg.OKCANCEL,
          prompt: true,
          fn: function (btn, value) {
-           btn == "ok" && value == "RESTART" && me.server.bgRestart({});
+           if (btn == "ok" && value == "RESTART") {
+             me.showLoadmask('Restarting delayed job...');
+             me.server.bgRestart({});
+           }
          }
        });
     }

data/lib/marty/data_change.rb

@@ -123,6 +123,12 @@ class Marty::DataChange
       do_export(pt, klass.constantize, sort_field, exclude_attrs)
   end
 
+  delorean_fn :do_pg_enum_export, sig: 1 do
+    |k|
+    klass = k.constantize
+    next (klass.is_a? Marty::PgEnum) ? klass.get_all : []
+  end
+  
   delorean_fn :export_changes, sig: 3 do
     |t0, t1, class_name|
 

data/lib/marty/data_exporter.rb

@@ -129,7 +129,6 @@ class Marty::DataExporter
 
       # remove _id
       c = c[0..-4]
-
       assoc_keys = type[:assoc_keys]
 
       # if association has a single key, just use col name

data/lib/marty/rpc_call.rb

@@ -1,7 +1,9 @@
 class Marty::RpcCall
   # POST to a remote marty
-  def self.marty_post(host, port, path, script, node, attrs, params, options={})
+  def self.marty_post(host, port, path, script, node, attrs, params, options={},
+                      ssl=false)
     http = Net::HTTP.new(host, port)
+    http.use_ssl = ssl
     request = Net::HTTP::Post.new(path)
     request.add_field('Content-Type', 'application/json')
     request.body = (options + {

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.39"
+  VERSION = "1.0.41"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.39
+  version: 1.0.41
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg