mns_subscriber 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81dee6e07f57da3f06e1cdd731dbfef221adf195
-  data.tar.gz: 65499f71860455d16753039063b6341660afcbcb
+  metadata.gz: d6da650c65de84f41584341bfbed925060973d9a
+  data.tar.gz: 1c81ea15f3677db648fd7fc46f482e200612a7d2
 SHA512:
-  metadata.gz: ec295fc51fcab91a1832e241aa9e68917e26fe58c6df9c43d14fa59c4af857a7037ca2c7def05d1dcfd3c4a60dc133f71bb704051a9f840f44915bfe532ebee9
-  data.tar.gz: '07817bfbda96c2a3ad3fdc86b481b499196818cb85bb9d34158ce474aafcf78101789896bf29353af04ebd2d7c11aeec64a97cce87ca3f27bbc47a736fdef7f8'
+  metadata.gz: 8f9daef95b43094b1136c67ee627c90908d9c7aebab52e456b6d30b7d7003b3938eb91f322679c6d7ce522af91b8714ddabc42d14c577b5753cd3629cae85e35
+  data.tar.gz: 3d96323069f4aa9353ab712eddba10db68634f5365023f06cf7f0df7c61a3ccc4a3aacd0802665f4b2a771e51d8cfc83878cc427dab45630a745391d90ac8234

data/lib/mns_subscriber.rb

@@ -26,6 +26,8 @@ class MNSSubscriber < SPSSub
 
     super(host: host, port: port)
     @filepath, @timeline = dir, timeline
+    
+    @index = nil
 
   end
 
@@ -57,14 +59,13 @@ class MNSSubscriber < SPSSub
       
     when :delete
       
-      subtopic = a[-2]
-      delete_notice(subtopic, msg)
-      update_index_xml(subtopic)
+      delete_notice(subtopic=a[-2], msg)
+      
     else
       
       subtopic, id = a[1..-1]
       add_notice(subtopic, msg, id)
-      update_index_xml(subtopic)
+      
     end    
 
   end
@@ -99,6 +100,8 @@ class MNSSubscriber < SPSSub
         table: {items: record})
       index.create record
       
+      update_index_xml(index, topic_dir)
+      
     end
     
     self.notice "%s/add: %s/status/%s"  % [@timeline, topic, id] if @timeline
@@ -120,43 +123,34 @@ class MNSSubscriber < SPSSub
     
     if File.exists? indexdb then
       
-      RecordxSqlite.new(indexdb, table: 'items').delete id
-      
+      index = RecordxSqlite.new(indexdb, table: 'items')
+      index.delete id
+      update_index_xml(index, topic_dir)
     end
     
   end
   
-  def update_index_xml(topic)
+  def update_index_xml(index, topic_dir)
+                            
+    # create the index.xml file
     
-    topic_dir = File.join(@filepath, topic)
-    indexdb = File.join(topic_dir, 'index.db')
-        
-    if File.exists? indexdb then
-            
-      items = RecordxSqlite.new(indexdb, table: 'items')
-      
-      # create the index.xml file
-      
-      a = items.order(:desc).first(15)
-      a2 = a.map(&:to_h)
-      a2.each {|x| x[:item_id] = x.delete :id }
+    a = index.order(:desc).first(15)
+    a2 = a.map(&:to_h)
+    a2.each {|x| x[:item_id] = x.delete :id }
 
-      dx = Dynarex.new
-      
-      dx.import a2
-      dx.order ='descending'
-      #dx.default_key = 'item_id'      
-      
-      dx.save File.join(topic_dir, 'index.xml')
-      
-    end        
+    dx = Dynarex.new    
+    dx.import a2
+    dx.order ='descending'
+    #dx.default_key = 'item_id'      
+    
+    dx.save File.join(topic_dir, 'index.xml')    
     
   end
 
   def update_attributes(attribute, topic, value)
     
     topic_dir = File.join(@filepath, topic)
-    notices = DailyNotices.new topic_dir, @options.merge(identifier: topic)              
+    notices = DailyNotices.new topic_dir, @options.merge(identifier: topic)
     notices.method((attribute.to_s + '=').to_sym).call(value)
     notices.save
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mns_subscriber
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - James Robertson