marty 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6954bc349cc4800a6505d17737f5ddcb91ce16b2
-  data.tar.gz: 8bfff59fcd54425f3f076b0fdc61ec98a5d52b23
+  metadata.gz: 9490119689a36383db480bd8b3f892904a08a3cf
+  data.tar.gz: bc813657c712c00d9b26da1a20c7cb8332a0ffc8
 SHA512:
-  metadata.gz: f3d5897c69ee0feb698f467a30095273ba724a030fbeae9032f82129e3341b6905c67ededb6256264079702a68a286076ae216d9384b06eb84edbf3d1b4c7300
-  data.tar.gz: f36961f6208fbdef9d54a9f717cadb04cac2bb5a3d7c956905a650718d7996c155469d93f0ac3dce78d16991fbac1d6947625acb81ca2f0ccaf5458c48821459
+  metadata.gz: 3bfa1deaffa80e3a1587026420911090696aa1c5221921dbec985b894f1a9ae506234935d6f5dfbae51e4e9079556669c5c393bf76451087072e0867a326cb85
+  data.tar.gz: ad7b61d596677b04ff6445122096103b520912022d79871254a881e8775ee5141728da76d141b3d77b3acfbf344539e027d4f21b54e8b8ec8f005e81246540f1

data/app/components/marty/main_auth_app.rb

@@ -221,9 +221,7 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   def bg_command(param)
     e, root, p = ENV['RAILS_ENV'], Rails.root, Marty::Config["RUBY_PATH"]
-    # preserve backward compatability with Gemini
-    # for new Rails apps, use 'bin/delayed_job'
-    dj_path = Marty::Config["DELAYED_JOB_PATH"] || 'script/delayed_job'
+    dj_path = Marty::Config["DELAYED_JOB_PATH"] || 'bin/delayed_job'
     cmd = "export RAILS_ENV=#{e};"
     # FIXME: Environment looks to be setup incorrectly - this is a hack
     cmd += "export PATH=#{p}:$PATH;" if p

data/app/models/marty/event.rb

@@ -13,6 +13,10 @@ class Marty::Event < Marty::Base
 
   validates_with EventValidator
 
+  after_validation(on: [:create, :update]) do
+    self.comment = self.comment.truncate(255) if self.comment
+  end
+
   BASE_QUERY = "SELECT ev.id,
                    ev.klass,
                    ev.subject_id,
@@ -102,7 +106,7 @@ class Marty::Event < Marty::Base
     hash = all_running.select do |pm|
       pm["klass"] == klass && pm["subject_id"] == subject_id.to_i &&
         (operation.nil? || pm["enum_event_operation"] == operation)
-    end.sort { |a, b| b["start_dt"] <=> a["start_dt"] }.first
+    end.last
 
     return hash if hash
 
@@ -111,7 +115,7 @@ class Marty::Event < Marty::Base
     get_data("SELECT * FROM (#{BASE_QUERY}) sub
               WHERE klass = '#{klass}'
                 AND subject_id = #{subject_id} #{op_sql}
-             ORDER BY start_dt desc").first
+             ORDER BY end_dt desc").first
   end
 
   def self.currently_running(klass, subject_id)
@@ -188,7 +192,8 @@ class Marty::Event < Marty::Base
                                        ORDER BY end_dt DESC) rownum, *
              FROM (#{BASE_QUERY}) sub2
              WHERE end_dt IS NOT NULL and end_dt > '#{cutoff}') sub1
-         WHERE rownum = 1"
+         WHERE rownum = 1
+         ORDER BY end_dt"
       )
       @all_finished[:timestamp] = time_now_i
       raw.each_with_object(@all_finished[:data]) do |ev, hash|

data/db/seeds.rb

@@ -47,6 +47,7 @@ unless Marty::Tag.find_by_name('DEV')
   tag.save!
 end
 
-# one time set up for delayed_job/promises, override as needed
+# one time set up for delayed_job/promises, override only needed
+# if DELAYED_JOB_PATH is not bin/delayed_job
 Marty::Config["DELAYED_JOB_PARAMS"] = "-n 4"
-Marty::Config["DELAYED_JOB_PATH"]   = "bin/delayed_job"
+# Marty::Config["DELAYED_JOB_PATH"]   = "script/delayed_job"

data/lib/marty/migrations.rb

@@ -39,9 +39,8 @@ module Marty::Migrations
       SELECT ENUM_RANGE(null::#{enum_name});
     SQL
 
-    db_values = res.first['enum_range'].gsub(/[{}]/, '').split(',')
+    db_values = res.first['enum_range'].gsub(/[{"}]/, '').split(',')
     ex_values = klass::VALUES - db_values
-
     puts "no new #{klass}::VALUES to add" if ex_values.empty?
 
     #hack to prevent transaction

data/lib/marty/promise_job.rb

@@ -13,6 +13,7 @@ class Delorean::BaseModule::NodeCall
   # Monkey-patch '|' method for Delorean NodeCall to create promise
   # jobs and return promise proxy objects.
   def |(args)
+
     if args.is_a?(String)
       attr = args
       args = [attr]
@@ -56,22 +57,25 @@ class Delorean::BaseModule::NodeCall
     # been reserved yet.
     promise.job_id = job.id
     promise.save!
+
     event = Marty::Event.
-                   create!(promise_id: promise.id,
-                           klass:      params[:__metadata__][:klass],
-                           subject_id: params[:__metadata__][:id],
-                           enum_event_operation:
-                             params[:__metadata__][:operation]) if
-      params[:__metadata__]
+            create!(promise_id: promise.id,
+                    klass:      params["p_event"]["klass"],
+                    subject_id: params["p_event"]["id"],
+                    enum_event_operation:
+                      params["p_event"]["operation"]) if
+      params["p_event"]
     Marty::PromiseProxy.new(promise.id, timeout, attr)
   end
 end
 
 
 class Delorean::Engine
-  def background_eval(node, params, attrs, meta = {})
+  def background_eval(node, params, attrs, event = {})
     raise "background_eval bad params" unless params.is_a?(Hash)
-    params[:__metadata__] = meta unless meta.empty?
+    params["p_event"] = event.each_with_object({}) do |(k, v), h|
+      h[k.to_s] = v
+    end unless event.empty?
     nc = Delorean::BaseModule::NodeCall.new({}, self, node, params)
     # start the background promise
     nc | attrs

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.13"
+  VERSION = "1.0.14"
 end

data/spec/features/scripting_spec.rb

@@ -373,6 +373,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
     end
 
     and_by 'delete script' do
+      wait_for_ajax
       script_grid.select_row(1)
       press('Delete Script')
       find(:xpath, "//div[text()='Confirmation']", wait: 5)

data/spec/models/event_spec.rb

@@ -4,6 +4,7 @@ require 'job_helper'
 describe Marty::Event do
   before(:all) do
     @clean_file = "/tmp/clean_#{Process.pid}.psql"
+    @save_file = "/tmp/save_#{Process.pid}.psql"
     save_clean_db(@clean_file)
 
     # transactional fixtures interfere with queueing jobs
@@ -48,6 +49,7 @@ describe Marty::Event do
                                  operation: 'PRICING'})
     res.force
     sleep 5
+    save_clean_db(@save_file)
   end
 
   after(:all) do
@@ -56,8 +58,13 @@ describe Marty::Event do
     stop_delayed_job
   end
 
+  before(:each) do
+    restore_clean_db(@save_file, false)
+    Marty::Event.clear_cache
+  end
+
 
-  it "Event tests" do
+  it "reports currently running" do
     expect(Marty::Event.currently_running('testcl1', 123)).to eq(
       ['AVM', 'CRA', 'PRICING'])
     expect(Marty::Event.currently_running('testcl2', 123)).to eq([])
@@ -100,9 +107,12 @@ describe Marty::Event do
       ['AVM', 'CRA', 'PRICING'])
     expect(Marty::Event.currently_running('testcl2', 123)).to eq(
       [])
-
     Timecop.return
 
+  end
+
+  it "misc API tests" do
+
     af = Marty::Event.all_finished
     expect(af.count).to eq(2)
     expect(af).to include(['testcl3', 987])
@@ -143,6 +153,9 @@ describe Marty::Event do
     expect(af[['testcl1', 123]]).to include('AVM')
     expect(af[['testcl1', 123]]['AVM']).to start_with(@date_string)
 
+  end
+
+  it "raises on error" do
     expect {Marty::Event.create_event('testcl', 1234, 'AVM', Time.zone.now, 600,
                                       "the comment") }.not_to raise_error
 
@@ -164,13 +177,38 @@ describe Marty::Event do
       to raise_error(%r!PG::.*invalid input value for enum.*"AMV"!)
     Marty::Event.clear_cache
     af = Marty::Event.all_finished
-    expect(af.count).to eq(5)
+    expect(af.count).to eq(4)
     expect(af).to include(['testcl', 1234])
     expect(af).to include(['testcl', 2345])
     expect(af[['testcl', 1234]]).to include('AVM')
     expect(af[['testcl', 2345]]).to include('AVM')
     expect(af[['testcl', 1234]]['AVM']).to start_with(@date_string)
     expect(af[['testcl', 2345]]['AVM']).to start_with(@date_string)
+  end
+
+  it "truncates long comment" do
+    long_comment = "comment string abcdefg"*100
+    long_comment_truncated = long_comment.truncate(255)
+    Marty::Event.create_event('testcl', 123, 'PRICING', Time.zone.now, 600,
+                              long_comment)
+    Marty::Event.create!(klass: 'testcl',
+                         subject_id: 456,
+                         enum_event_operation: 'CRA',
+                         start_dt: Time.zone.now,
+                         expire_secs: 600,
+                         comment: long_comment)
+
+    Marty::Event.create_event('testcl', 789, 'AVM', Time.zone.now, 600,
+                              "comment")
+    Marty::Event.finish_event('testcl', 789, 'AVM', long_comment)
+
+    e1 = Marty::Event.lookup_event('testcl', 123, 'PRICING').first
+    e2 = Marty::Event.lookup_event('testcl', 456, 'CRA').first
+    e3 = Marty::Event.lookup_event('testcl', 789, 'AVM').first
+
+    expect(e1["comment"]).to eq(long_comment_truncated)
+    expect(e2["comment"]).to eq(long_comment_truncated)
+    expect(e3["comment"]).to eq(long_comment_truncated)
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg