marty 1.0.51 → 1.0.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c1999e93a298020436ad757f39f5a578c6d8c8
-  data.tar.gz: b0e144e8cf6ad3e99373ec0c5f89d15d7030d235
+  metadata.gz: e71e2648231c978b93c862ad779fa0df575f2d63
+  data.tar.gz: 2f4298094bc075059572563c6bd2b50b28592ed7
 SHA512:
-  metadata.gz: fc71562cf81e8699cbeef23d79f6465fad439ccbe43639422444be67f7d557e80d634ecef1969b8409982b479829ea1319c0d8fac3fc387835b05a821cbe0fae
-  data.tar.gz: 7638536ad3d07a7196b5eff15498f2cb3c04792c280419d16578825cf17ddd4613a21a9535e1c03bf95042dd0c3336b9721711eb06b4badf066e8c89d8c62269
+  metadata.gz: 6540246a26e8de445e57613206a53f15d755848e2a8e3fe0a0ddd2259a5d158fe9402174e87d91aa251313f1d6809102e55f750e4c44ac1b589dc7a427b12e6a
+  data.tar.gz: 1466a7f5b8d6f05c83efd822a6ed47ca0a4698e4ccaae5b68b1326c5cf28b5820120fb995b85a915aeff343fb92460e8ce41d0c452968c9c28b76345e6a756a8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (1.0.50)
+    marty (1.0.52)
       axlsx (= 2.1.0pre)
       coderay
       delorean_lang (~> 0.1)

data/app/components/marty/script_form.rb

@@ -59,10 +59,9 @@ class Marty::ScriptForm < Marty::Form
     }
     JS
 
-    c.download_report = l(<<-JS)
-    function(jid) {
-      // FIXME: seems pretty hacky
-      window.location = "#{Marty::Util.marty_path}/job/download?job_id=" + jid;
+    c.get_report = l(<<-JS)
+    function(report_path) {
+      window.location = report_path;
     }
     JS
   end
@@ -175,16 +174,15 @@ class Marty::ScriptForm < Marty::Form
     return client.netzke_notify("bad script") unless script
 
     begin
-      job_id = Marty::Util.
-               background_report("ScriptReport",
-                                 "PrettyScript",
-                                 {
-                                   "script_id" => script.id,
-                                   "title"     => script.name,
-                                 },
-                                 true,
-                                )
-      client.download_report job_id
+      rep_params = {
+        script_id: script.id,
+        title: script.name
+      }
+
+      path = Marty::Util.gen_report_path("ScriptReport",
+                                         "PrettyScript",
+                                         rep_params)
+      client.get_report(path)
     rescue => exc
       return client.netzke_notify "ERROR: #{exc}"
     end

data/app/controllers/marty/diagnostic_controller.rb

@@ -1,4 +1,6 @@
+include ActionView::Helpers::TextHelper
 require 'erb'
+
 module Marty
   class DiagnosticController < ActionController::Base
     layout false
@@ -80,7 +82,7 @@ module Marty
       end
 
       def self.error message
-        "Failure: (#{message})"
+        "Failure: #{message}"
       end
 
       def self.display data, type='nodal'
@@ -104,7 +106,7 @@ module Marty
                       <tr class="<%=is_failure?(value) ? 'failed' :
                                     'passed' %>">
                         <td><%=name%></td>
-                        <td class="overflow"><%=value%></td>
+                        <td class="overflow"><%=simple_format(value.to_s)%></td>
                       </tr>
                     <% end %>
                     </table>
@@ -181,8 +183,8 @@ module Marty
 
       def self.db_version
         begin
-        message = ActiveRecord::Base.connection.
-                    execute('SELECT VERSION();')[0]['version']
+          message = ActiveRecord::Base.connection.
+                      execute('SELECT VERSION();')[0]['version']
         rescue => e
           return error(message)
         end
@@ -191,11 +193,13 @@ module Marty
 
       def self.db_schema
         begin
-          message = ActiveRecord::Migrator.current_version
+          current = ActiveRecord::Migrator.current_version
+          needs_migration = ActiveRecord::Migrator.needs_migration?
         rescue => e
           return error(e.message)
         end
-        message
+        needs_migration ? error("Migration is needed.\n"\
+                                "Current Version: #{current}") : current
       end
     end
 
@@ -217,11 +221,17 @@ module Marty
 
     class Nodes < Base
       def self.generate
-        a_nodes  = AwsInstanceInfo.is_aws? ? AwsInstanceInfo.new.nodes.sort : []
+        begin
+          a_nodes  = AwsInstanceInfo.new.nodes.sort if AwsInstanceInfo.is_aws?
+        rescue => e
+          a_nodes = [e.message]
+        end
         pg_nodes = get_nodes.sort
-        message  = pg_nodes == a_nodes ? pg_nodes.join(', ') :
-                     error("Postgres: [#{pg_nodes.join(', ')}]"\
-                           " - AWS: [#{a_nodes.join(', ')}]")
+        message  = a_nodes.nil? || pg_nodes == a_nodes ? pg_nodes.join("\n") :
+                     error("There is a discrepancy between nodes connected to "\
+                           "Postgres and those discovered through AWS EC2.\n"\
+                           "Postgres: \n#{pg_nodes.join("\n")}\n"\
+                           "AWS: \n#{a_nodes.join("\n")}")
         {"PG/AWS" => message}
       end
     end

data/app/controllers/marty/rpc_controller.rb

@@ -82,18 +82,15 @@ class Marty::RpcController < ActionController::Base
     end
 
     return {error: "Malformed params"} unless params.is_a?(Hash)
-
-    need_log, need_input_validate, need_output_validate, need_strict_validate = (
-      Marty::ApiConfig.lookup sname, node, attr)
-
-    opt = {
-      validate_schema:   true,
-      errors_as_objects: true,
-      version:           Marty::JsonSchema::RAW_URI,
-    }
-
-    to_append        = {"\$schema" => Marty::JsonSchema::RAW_URI}
-    validation_error = nil
+    need_log,
+    need_input_validate,
+    need_output_validate,
+    need_strict_validate = Marty::ApiConfig.lookup(sname, node, attr)
+    opt                  = {validate_schema:   true,
+                            errors_as_objects: true,
+                            version:           Marty::JsonSchema::RAW_URI }
+    to_append            = {"\$schema" => Marty::JsonSchema::RAW_URI}
+    validation_error     = nil
 
     if need_input_validate
       begin

data/app/views/marty/diagnostic/op.html.erb

@@ -32,6 +32,7 @@
                   color: #ffffff
       }
       td.desc { font-size: 10pt; }
+      p  { white-space: pre-line;}
       h1 { display: block;
            margin: 0px auto 40px auto;
            padding: 8px;

data/lib/marty/util.rb

@@ -121,4 +121,15 @@ module Marty::Util
 
     promise_id
   end
+
+  # generates the report path to report described by script, node, and params
+  def self.gen_report_path(script, node, params = {})
+    engine = Marty::ScriptSet.new.get_engine(script)
+    format = engine.evaluate(node, 'format')
+    title  = params.delete(:title) || engine.evaluate(node, 'title')
+    data   = ({selected_script_name: script,
+               selected_node: node} + params).to_json
+    URI.encode("#{Marty::Util.marty_path}/report?data=#{data}"\
+               "&reptitle=#{title}&format=#{format}")
+  end
 end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.51"
+  VERSION = "1.0.52"
 end

data/spec/controllers/diagnostic_controller_spec.rb

@@ -43,19 +43,19 @@ module Marty
         <th colspan="2" class=""><small>consistent</small></th>
         <tr class="passed">
           <td>Marty</td>
-          <td class="overflow">#{Marty::VERSION}</td>
+          <td class="overflow"><p>#{Marty::VERSION}</p></td>
         </tr>
         <tr class="passed">
           <td>Delorean</td>
-          <td class="overflow">#{Delorean::VERSION}</td>
+          <td class="overflow"><p>#{Delorean::VERSION}</p></td>
         </tr>
         <tr class="passed">
           <td>Mcfly</td>
-          <td class="overflow">#{Mcfly::VERSION}</td>
+          <td class="overflow"><p>#{Mcfly::VERSION}</p></td>
         </tr>
         <tr class="passed">
           <td>Git</td>
-          <td class="overflow">#{git}</td>
+          <td class="overflow"><p>#{git}</p></td>
         </tr>
       </table>
       </div>
@@ -71,38 +71,38 @@ module Marty
         <th colspan="2" class="error"><small>node1</small></th>
         <tr class="passed">
           <td>Marty</td>
-          <td class="overflow">#{Marty::VERSION}</td>
+          <td class="overflow"><p>#{Marty::VERSION}</p></td>
         </tr>
         <tr class="passed">
           <td>Delorean</td>
-          <td class="overflow">#{Delorean::VERSION}</td>
+          <td class="overflow"><p>#{Delorean::VERSION}</p></td>
         </tr>
         <tr class="passed">
           <td>Mcfly</td>
-          <td class="overflow">#{Mcfly::VERSION}</td>
+          <td class="overflow"><p>#{Mcfly::VERSION}</p></td>
         </tr>
         <tr class="passed">
           <td>Git</td>
-          <td class="overflow">#{git}</td>
+          <td class="overflow"><p>#{git}</p></td>
         </tr>
       </table>
       <table>
         <th colspan="2" class="error"><small>node2</small></th>
         <tr class="passed">
           <td>Marty</td>
-          <td class="overflow">#{val}</td>
+          <td class="overflow"><p>#{val}</p></td>
         </tr>
         <tr class="passed">
           <td>Delorean</td>
-          <td class="overflow">#{Delorean::VERSION}</td>
+          <td class="overflow"><p>#{Delorean::VERSION}</p></td>
         </tr>
         <tr class="passed">
           <td>Mcfly</td>
-          <td class="overflow">#{Mcfly::VERSION}</td>
+          <td class="overflow"><p>#{Mcfly::VERSION}</p></td>
         </tr>
         <tr class="passed">
           <td>Git</td>
-          <td class="overflow">#{git}</td>
+          <td class="overflow"><p>#{git}</p></td>
         </tr>
       </table>
       </div>

data/spec/controllers/rpc_controller_spec.rb

@@ -1191,7 +1191,7 @@ describe Marty::RpcController do
         ].each do
           |a, exp|
           do_call(*a)
-          res = JSON.parse(response.body)
+          res = JSON.parse(response.body) rescue response.body
           expect(res.is_a?(Hash) ? res['error'] : res).to include(exp)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.51
+  version: 1.0.52
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg