mns_subscriber 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba7ffb83b3ae3627fe99ba11f1d3c6ca5b20beadf702ba658bf87a596a877dbb
-  data.tar.gz: 5070727cf3f6443a3653edfa9cee25a81fbdb7a91a9253a72a42a8a7fa122ecb
+  metadata.gz: 2099c1bf98a5fa9859568e0ce7e71f1c0fa1eb695254241d2b47d99aac67472e
+  data.tar.gz: de2866f869b308ea2b5b18e982480a3a29ebf839f67a196c1c74517f1b79c2f8
 SHA512:
-  metadata.gz: 8773c8013caf65d54f7bb8a75543e5826f47a46c92235f4ea9766ea095f8cdcca4ae256ea9c65e8ef112f597eb8e5c46fb46d25b7a14d016d71630d6216b4fe2
-  data.tar.gz: 448558190b8e5082a8226cdf617b7c572a9125c6f57e2d5e9566f31bcc20b06e536ffeb5d1f334275f21cc0b3a1410ceaa1b143f3e26c589e383f3bffe45abf3
+  metadata.gz: 3c9b72b377b23bb5070991510caab1ec8d5a208b848bd2065388459fd5e731ea9b325edd751f68853ecf8c6c4bd82ebe9df2a9171667728d5f1b9371dbc614ee
+  data.tar.gz: 31468678c034180943413d76f0c728e5848aafb9253d06ecf9255d647f8e56afe041ecfffbf24917571210dd57d6f11f23943323b1d71b317d32387d503cea7f

data/lib/mns_subscriber.rb

@@ -24,7 +24,9 @@ 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, log: log)
@@ -85,6 +87,40 @@ class MNSSubscriber < SPSSub
       
       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]
@@ -98,7 +134,12 @@ class MNSSubscriber < SPSSub
 
     @log.info 'mns_subscriber/add_notice: active' if @log
     topic_dir = File.join(@filepath, topic)
-    notices = DailyNotices.new topic_dir, @options.merge(identifier: topic, 
+    
+    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)
 
     t = Time.now
@@ -177,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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mns_subscriber
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   yOAycOYzp7fxmPl3/HV5D0YOJwuy1XslA50GQJwq12A5vMyUGUCHuxH/zKZcM/zr
   0QZaKiVqq5ZeGvni0eQSavhQ
   -----END CERTIFICATE-----
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mtlite
@@ -118,7 +118,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []