dynarex-events 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b399811476c1f91e12fbfb070f5fc999590bfe31
-  data.tar.gz: ff2f614db99a2beaaec82e61b86d61b3a7b1225b
+  metadata.gz: 3133830be2fc1faa4cda6d4b922a1d044e9fcfee
+  data.tar.gz: eefd04067e8bc55452dd311d1130a03ce7840105
 SHA512:
-  metadata.gz: 578176b86c1916104e97c742bc0282143c9f9b24e0f75f33792e3363a8868f8e5a26d9438064149bc8c26c51f3a5f65c5b191dd61b81c5cebe5e23469275f226
-  data.tar.gz: ab92aeb414777e9054439223fc9fda9ec94136339e82c0b25c929899ea584d222e859de354c358052cd08c290a6868b0c1cb48f279428c57208e3c4e578d3e69
+  metadata.gz: 759f9aca0e2ac2678b468b60df96d40617cfdb0f969ba7d003bc87114580eba97d062af8d09b5fe39e2c30f3a888614a3063a2a7d558c49f3e2fd15624337a1c
+  data.tar.gz: bad67edc4b6137c5a7d4d420d841597f59ffca43ffcab2c8545683df736e6143f3a48ead80ca577b22679f0c9c5cbc51cfeb9d99f0b6b42295843d606ead8c87

data/lib/dynarex-events.rb

@@ -15,7 +15,7 @@ class DynarexEvents < DynarexCron
     
     opt = {sps_address: nil, drb_server: nil}.merge options
     
-    @entries, @cron_events  = [], []
+    @entries, @other_entries, @cron_events  = [], [], []
 
     @dynarex_file = dynarex_file
     load_events()
@@ -37,14 +37,15 @@ class DynarexEvents < DynarexCron
 
   def add_entry(h)
     # if the entry already exists delete it
-    @entries.delete @entries.find {|x| x[:job] == h[:job]}
-    @entries << h
+    @other_entries.delete @other_entries.find {|x| x[:job] == h[:job]}
+    @other_entries << h
   end
 
   def load_events()
     
     dynarex = Dynarex.new @dynarex_file
-    @entries = dynarex.to_h || @entries
+    @entries = (dynarex.to_h || []) + @other_entries
+
     @cron_events = self.to_a if @entries
     'events loaded and refreshed'
   end  
@@ -67,8 +68,9 @@ class DynarexEvents < DynarexCron
 
     @entries.inject([]) do |r,h| 
 
-      s = h[:expression].length > 0 ? h[:expression] : h[:date] + ' ' \
-            + h[:recurring].to_s 
+      s = h[:expression].to_s.length > 0 ? h[:expression] : 
+        h[:date] + ' ' + h[:recurring].to_s 
+
       h[:cron] = ChronicCron.new(s) 
       h[:job] ||= 'pub event: ' + h[:title]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex-events
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - James Robertson