dynarex-events 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbbe0b1f9a16eb05e43d5ec665cab1c9c8ed7ac2
-  data.tar.gz: bb72ad82fcc7783bca92f3d40e778f9b4422d5cd
+  metadata.gz: 61cdec1f0220d10ebb2eb5668ed9503d59d84b65
+  data.tar.gz: e80cc0cbd8f430f523193cce5bf731796bb61546
 SHA512:
-  metadata.gz: 5d41932b4fe96ac513904376cd00cc6d803990c9afe45e2859ec7522ba092a08bde15c5c78305b28b65d2a7776300b1a16ed14a02657a539dfba250ed2a940cb
-  data.tar.gz: e24e8dbbcab66fa33017dcffeb5dbb4457440cc8171dc647ffe68af4cab4d064905f293f7f9cf088c4f43463f7902648c13409b0260cda2a45d82d18f92b697f
+  metadata.gz: 57a2a8d8b9c1e7ca56420ffec0b182cd74086bc5031337e6dcf077e00df0c31e80752ab0322b79bd2da39d29efed6b47ab753158c0a6e4c52f8175fe7d8ae836
+  data.tar.gz: bcefdb12dbeab3d261c3d4662a738ff318ce0d15aa8ae852b7bc8fa51b6f7dd0e526e2f1a4249e93458700cee06f3b2c0ff7bd7b08a368478006eaadd9c36c95

checksums.yaml.gz.sig

@@ -1,4 +1,2 @@
-�âP�2�αv�+v)@����u�$Y����2�
-�����(�Le�_,����!���_M�>�se_X2N1��jw�ڋ-6L���
-($Y�w��#P%ӕ	f��Kȱ��A��|2b}
�^[�����C�ݘ:��
-�'��St���%��Q8ER�@�0�za9B�T:������6qI��(K8�?}�:uu�o��f{ȱ��;��M��4�=�2ʚ�~��'ǢS���GR'
+r*U �E
+A�i�bpm蟪V���K,�k�hw�¬�z��Z[݈lM1ht����I������灳����H���a��\a��K �<�z

data/lib/dynarex-events.rb

@@ -9,23 +9,25 @@ class DynarexEvents < DynarexCron
 
   attr_reader :to_a
 
+  # options: e.g. sps_address, 'sps', drb_server: 58000
+  #
   def initialize(dynarex_file=nil, options={})
     
-    opt = {sps_address: nil, drb_server: false}.merge options
-    
-    @cron_events  = []
+    opt = {sps_address: nil, drb_server: nil}.merge options
     
+    @entries, @cron_events  = [], []
+
     @dynarex_file = dynarex_file
     load_events()
 
     @sps_address = opt[:sps_address]
     
-    if opt[:drb_server] == true then
-      
+    if opt[:drb_server] then
+
       Thread.new {
         
         # start up the DRb service
-        DRb.start_service 'druby://:57500', self
+        DRb.start_service 'druby://:' + opt[:drb_server], self
 
         # wait for the DRb service to finish before exiting
         DRb.thread.join    
@@ -33,11 +35,18 @@ class DynarexEvents < DynarexCron
     end
   end    
 
+  def add_entry(h)
+    # if the entry already exists delete it
+    @entries.delete @entries.find {|x| x[:job] == h[:job]}
+    @entries << h
+  end
+
   def load_events()
     
     dynarex = Dynarex.new @dynarex_file
-    @entries = dynarex.to_h
-    @cron_events = self.to_a
+    @entries = dynarex.to_h || @entries
+    @cron_events = self.to_a if @entries
+    'events loaded and refreshed'
   end  
   
   alias refresh load_events
@@ -53,13 +62,15 @@ class DynarexEvents < DynarexCron
   end  
   
   def to_a()
-    
+
+    return unless @entries
+
     @entries.inject([]) do |r,h| 
 
-      h[:cron] = ChronicCron.new(h[:date] + ' ' + h[:recurring]) 
-      h[:job] = 'pub event: ' + h[:title]
+      h[:cron] = ChronicCron.new(h[:date] + ' ' + h[:recurring].to_s ) 
+      h[:job] ||= 'pub event: ' + h[:title]
 
-      if h[:reminder].length > 0 then
+      if h[:reminder].to_s.length > 0 then
         rmndr = {}
         rmndr[:cron] = ChronicCron.new((Chronic.parse(h[:date]) - ChronicDuration.parse(h[:reminder])).to_s)
         rmndr[:job] = 'pub event: reminder ' + h[:title]
@@ -70,5 +81,4 @@ class DynarexEvents < DynarexCron
     end
     
   end
-end
-
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex-events
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - James Robertson
@@ -31,34 +31,34 @@ cert_chain:
   wC9cuVCUDZfVJ5fj3LNV2ZYGD4xDEqRa7w7DJluVaQSyYKIUqTFf7yOG5D2hu/OR
   5cbgqBz0i1h9/Q==
   -----END CERTIFICATE-----
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex_cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -78,12 +78,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []