marty 1.0.29 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f0e456b3f2f6ed223ac6cafc65455acd7608648
-  data.tar.gz: b86ba11ad450399e1a304d91850d2c06f828f8a7
+  metadata.gz: 8fc3a16a98d38f381e93606fb1e3c3506c25e799
+  data.tar.gz: b600f2a390ee82dd1654e04dc622225422297085
 SHA512:
-  metadata.gz: 2b636574915b6152a5e9dcf2c175903cc1caf31c739ba51a870867edd773d5047c0aa0e38f9f6168a2aa699821c7ccdb21d785c1ff7746de8a43acc6c015dc25
-  data.tar.gz: 0fb3385d4210b1d11e04b26074891ab5479560c47c7d5e15aa0d0055f29654bc40744020a5d3f5fa334af8650fa47468b01f05c89de9e08c8c70735794e59c0d
+  metadata.gz: 654e32fb7af551f2b69918df7d1875a9762107f75c13514a5457a8472cea089f38764b7cc1749e0695a9594eef5b42ead0054e11b7e259a951b79faf1102b718
+  data.tar.gz: 0e38a79bf663be9bf4e4450193d53ff509ce42c771df6c7aba9b2541b7a0ab88a496592c28aa1b65781fcda2093e3485733d100edec8d86fadfb99a3200365da

data/app/components/marty/event_view.rb

@@ -29,7 +29,8 @@ class Marty::EventView < Marty::Grid
 
     c.store_config.merge!({sorters: [{property: :id,
                                  direction: 'DESC',
-                                }]})
+                                     }]})
+    Marty::Event.cleanup
   end
 
   action :delete do |a|

data/app/models/marty/event.rb

@@ -259,7 +259,7 @@ SQL
   def self.all_finished
     @all_finished ||= {
       data:      {},
-      timestamp: Time.zone.parse('1970-1-1 00:00:00').to_i,
+      timestamp: Time.zone.parse('00:00:00').to_i,
     }
     @poll_secs ||= Marty::Config['MARTY_EVENT_POLL_SECS'] || 0
     time_now_i = Time.zone.now.to_i
@@ -301,4 +301,13 @@ SQL
   def self.get_finished(klass, id)
     all_finished[[klass, id]]
   end
+
+  def self.cleanup
+    begin
+      where('start_dt < ?', Time.zone.now - 48.hours).destroy_all
+    rescue => exc
+      Marty::Util.logger.error("event GC error: #{exc}")
+    end
+  end
+
 end

data/app/models/marty/user.rb

@@ -122,10 +122,6 @@ private
     errors.blank?
   end
 
-  delorean_fn :get_roles, sig: 0 do
-     Mcfly.whodunnit.roles
-  end
-
   def user_manager_only
     Marty::User.has_role("user_manager") && !Marty::User.has_role("admin")
   end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.29"
+  VERSION = "1.0.30"
 end

data/spec/models/event_spec.rb

@@ -144,13 +144,13 @@ describe Marty::Event do
     expect(ev4.end_dt).not_to be_nil
     expect(ev4.error).to be_truthy
 
-    expect(af.count).to eq(4)
+    expect(af.count).to eq(3)
     expect(af).to include(['testcl3', 987])
-    expect(af).to include(['testcl2', 123])
+    expect(af).to include(['testcl1', 234])
     expect(af[['testcl3', 987]]).to include('PRICING')
     expect(af[['testcl3', 987]]['PRICING']).to start_with(@date_string)
-    expect(af[['testcl2', 123]]).to include('PRICING')
-    expect(af[['testcl2', 123]]['PRICING']).to eq(@old_end)
+    expect(af[['testcl1', 234]]).to include('PRICING')
+    expect(af[['testcl1', 234]]['PRICING']).to start_with(@date_string)
 
     expect(Marty::Event.currently_running('testcl1', 123)).
       to eq(['AVM', 'CRA', 'PRICING'])
@@ -195,7 +195,7 @@ describe Marty::Event do
                                  "error"=>"f"})
 
     af = Marty::Event.all_finished
-    expect(af.count).to eq(5)
+    expect(af.count).to eq(4)
     expect(af[['testcl3', 987]]).to include('PRICING')
     expect(af[['testcl1', 123]]).to include('AVM')
     expect(af[['testcl1', 123]]['AVM']).to start_with(@date_string)
@@ -227,7 +227,7 @@ 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(6)
+    expect(af.count).to eq(5)
     expect(af).to include(['testcl', 1234])
     expect(af).to include(['testcl', 2345])
     expect(af[['testcl', 1234]]).to include('AVM')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.30
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg