mns_subscriber 0.4.9 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '0889ecb9db1e5bcf41e3a7ab47ce04d252dc05e4'
-  data.tar.gz: afc998311ab905e361e4cb7b09a75515fa5e7de5
+SHA256:
+  metadata.gz: 2099c1bf98a5fa9859568e0ce7e71f1c0fa1eb695254241d2b47d99aac67472e
+  data.tar.gz: de2866f869b308ea2b5b18e982480a3a29ebf839f67a196c1c74517f1b79c2f8
 SHA512:
-  metadata.gz: 9c2f8a3e55c0be33a4a984c6d9af46fa554dbf7b21fc02e12558e50bd1cbf5f53ceea4117996607c82b22249c4dadbdcd8699da77b751c72fb7139db7bae8bba
-  data.tar.gz: c5e5d5ed646a59c369f7967c16781a3c2354a45ffe2b2d1685c09b0ea7123f62de2a8b78d1f369c3d11008366246cce3ecff32d6b871749d4ee08851aefcf9ad
+  metadata.gz: 3c9b72b377b23bb5070991510caab1ec8d5a208b848bd2065388459fd5e731ea9b325edd751f68853ecf8c6c4bd82ebe9df2a9171667728d5f1b9371dbc614ee
+  data.tar.gz: 31468678c034180943413d76f0c728e5848aafb9253d06ecf9255d647f8e56afe041ecfffbf24917571210dd57d6f11f23943323b1d71b317d32387d503cea7f

data/lib/mns_subscriber.rb

@@ -12,7 +12,10 @@ require 'recordx_sqlite'
 class MNSSubscriber < SPSSub
 
   def initialize(host: 'sps', port: 59000, dir: '.', options: {}, 
-                 timeline: nil)
+                 timeline: nil, log: nil, hashtag_url: nil)
+    
+    @log = log
+    log.info 'mns_subscriber/initialize: active' if log
     
     # note: a valid url_base must be provided
     
@@ -21,13 +24,30 @@ class MNSSubscriber < SPSSub
       dx_xslt: '/xsl/dynarex.xsl', 
       rss_xslt: '/xsl/feed.xsl', 
       target_page: :page, 
-      target_xslt: '/xsl/page.xsl'      
+      target_xslt: '/xsl/page.xsl',
+      local_media_path: '/home/user/media',
+      url_media_path: 'http://media.yourwebsitehere.co.uk/'
     }.merge(options)
 
-    super(host: host, port: port)
+    super(host: host, port: port, log: log)
     @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
 
@@ -38,6 +58,8 @@ class MNSSubscriber < SPSSub
   private
 
   def ontopic(topic, msg)
+    
+    @log.info 'mns_subscriber/ontopic: topic: ' + topic.inspect if @topic
 
     a = topic.split('/')
     puts "%s: %s %s"  % [topic, Time.now.to_s, msg.inspect]
@@ -57,10 +79,48 @@ class MNSSubscriber < SPSSub
           
       update_attributes(:title, subtopic=a[-2], title=msg)
       
+    when :image
+          
+      update_attributes(:image, subtopic=a[-2], title=msg)      
+      
     when :delete
       
       delete_notice(subtopic=a[-2], msg)
       
+    when :json
+      
+      # JSON contains a message and 1 or more media files    
+      h = JSON.parse msg, symbolize_names: true
+      
+      subtopic = a[-2]
+      
+      t = Time.now
+      id = t.to_i.to_s + t.strftime("%2N")
+      
+      filepath = File.join(@options[:local_media_path], 'images')
+            
+      a = h[:files].map.with_index do |f,i|
+                
+        file = "%s%s" % [(id.to_i + i+1).to_s(36).reverse, File.extname(f)]
+        dest = File.join(filepath, file)
+        
+        FileUtils.cp f, dest
+        FileUtils.chmod 0755, dest
+        
+        dir = File.extname(file) =~ /\.(?:jpg|png)/ ? 'images' : ''
+        url = [@options[:url_media_path], dir, file].join('/')
+    
+        href = [@options[:url_base].sub(/\/$/,''), subtopic, 'status', id, 
+                'photo', (i+1).to_s ].join('/')
+        "<a href='%s'><img class='img1' src='%s'/></a>" % [href, url]
+            
+      end
+      
+      div = a.any? ? "<div id='media'>#{a.join}</div>" : ''
+      
+      add_notice(subtopic, h[:msg] + "\n" + div, id)      
+      
+      
     else
       
       subtopic, id = a[1..-1]
@@ -70,13 +130,20 @@ 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')
+    
+    options = @options.clone
+    options.delete :local_media_path
+    options.delete :url_media_path
+    
+    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(/(?=\{.*)/) 
@@ -89,6 +156,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
     
@@ -103,8 +191,13 @@ class MNSSubscriber < SPSSub
     return if return_status == :duplicate
     
     rxnotices = RecordxSqlite.new(File.join(topic_dir, 'notices.db'),
-      table: {notices: {id: 0, message: ''}})
-    rxnotices.create id: id.to_s, message: msg
+      table: {notices: {id: 0, description: '', message: ''}})
+    
+    begin
+      rxnotices.create id: id.to_s, description: desc, message: msg
+    rescue
+      puts 'warning: rxnotices.create -> ' + ($!).inspect
+    end
     
     if raw_json then
       
@@ -125,11 +218,16 @@ class MNSSubscriber < SPSSub
   
   def delete_notice(topic, msg)
     
+    
     topic_dir = File.join(@filepath, topic)
     
+    id = msg.to_i
+    
+    feed = DailyNotices.new topic_dir, log: @log  
+    feed.delete id
+    
     notices = RecordxSqlite.new(File.join(topic_dir, 'notices.db'), 
                                 table: 'notices')
-    id = msg.to_i
     notices.delete id
     
     indexdb = File.join(topic_dir, 'index.db')
@@ -167,4 +265,4 @@ class MNSSubscriber < SPSSub
   
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mns_subscriber
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.6.2
 platform: ruby
 authors:
 - James Robertson
@@ -10,49 +10,53 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MTExMjEzMjQxNFoXDTE3MTExMjEzMjQxNFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMqFKnOPj+Kvhml9lNrIzC2gky+FnaKMe2WdsJV4vjPJmdzDEXLQSiUgCVPK
-  S+0dqi6Z3oM70oxcC8v6VAD/dqM4HTriOK4Nv1JPw9T+BgYqHGouK3lZreNw4wVV
-  estB6K5HbD37Gxk6uPWxcmkODCZDLPDBEllLa8NH88uz4shWl24/i+9wxLwNnipb
-  tn2vLTKsfFKdqLWqmayBXhTEhfc70bBhmX5ZzchZi+Vsv7s69QHRWrmxT62D5O6Q
-  +qOWwFuZ/6Z7yFpjJmIfygkj/x+V8X8fQUGjDOqDT/uYFy9XvI+p5JkT07GsP5PX
-  E+7hp0eUkeclVrTyAKG7TkfkrYUCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUxf5o+IcWWZwAdWo1fmsk6kSdNz4wJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAkpQ4ktXo
-  B8riOdNUzvVlDquhwrFZwl8eWe/A5jTcXY9mYCPnzt7rp7gaMLENU54nK2e45U0Q
-  tw6jmHbp+1gfXuul+tVro6wZ/M1WBiotQfgzEPAtMENm/Jqs5BqUsa/BQwzRBBjM
-  EychMLNZt6rP/b1sOZ3RODk3OsZ0whwMBzNNR/h20qnAd0q5Y6I++xHFoW2mwjJ7
-  NLA6oOgvCF/KXGNlj7vHzhzzWsFGlEIawFhzvbQ9C4eJoAwFSrrzH+RvD1sMpq2Y
-  wBAv1HG6hlSk9BepsW4e+NbsgNYQdx0NkPtppfh502tww8DydLyWZNnEte5tAbjg
-  mBoofo/5xUxN5A==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMjI0MTMzNzMzWhcN
+  MjIwMjI0MTMzNzMzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCrXfm/
+  AwR/iY/kgH1QAHFOBfSTgEBjHDUxgQl7Z3+43Tc8UMifQIWh4opLpzwcazVtrOB7
+  O2hXRNG9M1Dy1bRSOBSsiKSlDtfcqXfLmGKQGczMK+i2x8TTty4Vc3NPOjQlHaCt
+  3KRPi/JiQ7OT+atmEEkfiDOWY5IpNHGiz93Q2L0+xUvp1fKtVedxeB/+kxuaP+C5
+  3YbxJ2jVRldAe0QA9zM9YITTLe/xoiHS0LpPmtIk+4wNOK/vPh2u+p/BX9PbWiGO
+  3KWzMuyCvtqDNXHdjEJ5KazWkL2By2k64eRVUuPHne8R4LYm3Ik3VfO/H759fdP3
+  Ap/L5pUprYRiq1NFBW5Ex3orjuCX/P887tahVho+RN8iUtkhMlQdk0uSRO8KP5Vz
+  kU09eIZ7o7JjftQliJ5+8O/hmtvCxXw1eystEVKJW32COaqFgLsM206ncMq4flTZ
+  5mU2/Cwz7SxWQQe0cIzTH+o1pejIS83IRRMgHEtgyki0yUKDcoZVhvNujrMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU0a7RWUQ4
+  bjy71dOj2inlBZ1u+NIwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEANZXVYK9Ut5FWc27EOT5ajSB/DVW6GXUMWGXNVLll
+  x6o5OX9r4xHlINGsTEI4q01kCBQsJCjQKNFOrUss+TsEFgXremusnniPwypvoCZh
+  JAmmUktsIKuKmgkJ6h1hhuJf6g90++v4iVvBHt53nhN8NaGYe4Oc2OwXTfxHam0X
+  JfCSR+Aw2QfaQvZKi8inGHgLmM61ABpIGTZ8lwzR6fizANDF6EQ7vNixJMSZExzP
+  s1BgeI/oTI1Y7UNeUtwWA8NkQ1bczUBH4FDUab4QRIbBYhXz+Hs8ddtugTzcmRwf
+  W0wI6iCh95fKaCbmSS5MY3dYMexH07A1XFGyHWOogCEWWYZ4ho+a44Fm0Uotp5ky
+  TjsXYJbdzlsAVQKfCSIfCi3T/k4bp/2wc342j/WYjkKLN4aZID+E9P/VX1Nc0m/s
+  yOAycOYzp7fxmPl3/HV5D0YOJwuy1XslA50GQJwq12A5vMyUGUCHuxH/zKZcM/zr
+  0QZaKiVqq5ZeGvni0eQSavhQ
   -----END CERTIFICATE-----
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mtlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: sps-sub
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +66,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,49 +76,49 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: daily_notices
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: recordx_sqlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -140,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Creates microblog posts from different identities by subscribing to the SPS