mns_subscriber 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55df9bad963044ed01313c1c749b43e8ae3d746a9107dbb3bb9c9ff938837f91
-  data.tar.gz: 706bda2bdeba756c74e945f0b73f810de3c7cadef841f48692e80ca17a53dc8a
+  metadata.gz: ba7ffb83b3ae3627fe99ba11f1d3c6ca5b20beadf702ba658bf87a596a877dbb
+  data.tar.gz: 5070727cf3f6443a3653edfa9cee25a81fbdb7a91a9253a72a42a8a7fa122ecb
 SHA512:
-  metadata.gz: 7ddd48242e49bc872922772f622c4f3f33e32718a8b4e09b880506a9f1b8be3c074428620757e8fa32b2af6db32123846b896019050b80fa412e6e448f784bc5
-  data.tar.gz: 79b6e558a22ba819116dffac11a1c873a8d5982730f2f0f2159cde9cecd109e673e4c300d4386c4f435f07104215007f5bbc1c405bdaa8713e37b7dda550647f
+  metadata.gz: 8773c8013caf65d54f7bb8a75543e5826f47a46c92235f4ea9766ea095f8cdcca4ae256ea9c65e8ef112f597eb8e5c46fb46d25b7a14d016d71630d6216b4fe2
+  data.tar.gz: 448558190b8e5082a8226cdf617b7c572a9125c6f57e2d5e9566f31bcc20b06e536ffeb5d1f334275f21cc0b3a1410ceaa1b143f3e26c589e383f3bffe45abf3

data/lib/mns_subscriber.rb

@@ -12,7 +12,7 @@ require 'recordx_sqlite'
 class MNSSubscriber < SPSSub
 
   def initialize(host: 'sps', port: 59000, dir: '.', options: {}, 
-                 timeline: nil, log: nil)
+                 timeline: nil, log: nil, hashtag_url: nil)
     
     @log = log
     log.info 'mns_subscriber/initialize: active' if log
@@ -31,6 +31,21 @@ class MNSSubscriber < SPSSub
     @filepath, @timeline = dir, timeline
     
     @index = nil
+    @hashtags = nil
+    
+    
+    if hashtag_url then
+      
+      @hashtag_url = @options[:url_base] + hashtag_url.sub(/^\//,'')      
+      
+      hashtag_path = File.join(dir, 'hashtag')
+      tagdb = File.join(hashtag_path, 'index.db')
+      FileUtils.mkdir_p File.dirname(tagdb)
+      
+      h = {hashtags: {id: '', tag: '', topic: '', noticeid: ''}}
+      @hashtags = RecordxSqlite.new(tagdb, table: h )            
+
+    end
 
   end
 
@@ -79,14 +94,15 @@ class MNSSubscriber < SPSSub
 
   end
 
-  def add_notice(topic, raw_msg, raw_id=Time.now)
+  def add_notice(topic, raw_msg, raw_id=nil)
 
     @log.info 'mns_subscriber/add_notice: active' if @log
     topic_dir = File.join(@filepath, topic)
     notices = DailyNotices.new topic_dir, @options.merge(identifier: topic, 
                         title: topic.capitalize + ' daily notices', log: @log)
 
-    id = (raw_id || Time.now).to_i
+    t = Time.now
+    id = (raw_id || t.to_i.to_s + t.strftime("%2N")).to_i
     
     # strip out any JSON from the end of the message
     msg, raw_json = raw_msg.split(/(?=\{.*)/) 
@@ -99,6 +115,27 @@ class MNSSubscriber < SPSSub
       mtlite.to_s
     end
     
+    if @hashtag_url then
+
+      tags = desc.scan(/(?<=#)\w+/)
+      
+      desc.gsub!(/#\w+/) do |x| 
+        "<a href='%s%s'>%s</a>" % [@hashtag_url, x[1..-1], x]
+      end
+      
+      # add the record to the database      
+      tags.each do |tag|
+        
+        t = Time.now
+        id2 = (t.to_i.to_s + t.strftime("%2N")).to_i        
+        h = {id: id2, tag: tag, topic: topic, noticeid: id}
+
+        @hashtags.create h if @hashtags
+        
+      end
+      
+    end
+    
     title = mtlite.to_s.lines.first.chomp
     title = title[0..136] + ' ...' if title.length > 140
     
@@ -113,10 +150,10 @@ class MNSSubscriber < SPSSub
     return if return_status == :duplicate
     
     rxnotices = RecordxSqlite.new(File.join(topic_dir, 'notices.db'),
-      table: {notices: {id: 0, message: ''}})
+      table: {notices: {id: 0, description: '', message: ''}})
     
     begin
-      rxnotices.create id: id.to_s, message: msg
+      rxnotices.create id: id.to_s, description: desc, message: msg
     rescue
       puts 'warning: rxnotices.create -> ' + ($!).inspect
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mns_subscriber
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   yOAycOYzp7fxmPl3/HV5D0YOJwuy1XslA50GQJwq12A5vMyUGUCHuxH/zKZcM/zr
   0QZaKiVqq5ZeGvni0eQSavhQ
   -----END CERTIFICATE-----
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mtlite
@@ -101,22 +101,22 @@ dependencies:
   name: recordx_sqlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: 
 email: james@jamesrobertson.eu
 executables: []