mns_subscriber 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2099c1bf98a5fa9859568e0ce7e71f1c0fa1eb695254241d2b47d99aac67472e
-  data.tar.gz: de2866f869b308ea2b5b18e982480a3a29ebf839f67a196c1c74517f1b79c2f8
+  metadata.gz: c9a3f061eca9581f000c9fd37c9341da37e29e723a883627b220045bc15daa68
+  data.tar.gz: 2c7ac5bb79b3b0bbc7edaf86c512aa06fd63d258ed2429788ee6d2f18644f26d
 SHA512:
-  metadata.gz: 3c9b72b377b23bb5070991510caab1ec8d5a208b848bd2065388459fd5e731ea9b325edd751f68853ecf8c6c4bd82ebe9df2a9171667728d5f1b9371dbc614ee
-  data.tar.gz: 31468678c034180943413d76f0c728e5848aafb9253d06ecf9255d647f8e56afe041ecfffbf24917571210dd57d6f11f23943323b1d71b317d32387d503cea7f
+  metadata.gz: 7ec27ad80dd5ccf4d69e9156a98ee5fc64870be0789f3d0eeaed9a449d52f1abec50eea61821d3e7ef97184c35882d0f1000a071507c7dd99ab45bba88141d44
+  data.tar.gz: 2adfaff285eb6677b02a0d4b501cf0f60400e91f0a6abe1dcc11a47602f8ae245b35ffbe66884fce01dc769742ce0201b7fe059e1a58ceb233307ce1f0534d2d

data/lib/mns_subscriber.rb

@@ -7,262 +7,380 @@ require 'mtlite'
 require 'sps-sub'
 require 'daily_notices'
 require 'recordx_sqlite'
+require 'easyimg_utils'
 
 
-class MNSSubscriber < SPSSub
-
-  def initialize(host: 'sps', port: 59000, dir: '.', options: {}, 
-                 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
-    
-    @options = {
-      url_base: 'http://yourwebsitehere.co.uk/', 
-      dx_xslt: '/xsl/dynarex.xsl', 
-      rss_xslt: '/xsl/feed.xsl', 
-      target_page: :page, 
-      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)
-    @filepath, @timeline = dir, timeline
-    
-    @index = nil
-    @hashtags = nil
-    
+module MNSSubscriber  
+  
+  class NoticeMgr
+    using ColouredText
     
-    if hashtag_url then
-      
-      @hashtag_url = @options[:url_base] + hashtag_url.sub(/^\//,'')      
+    def initialize(sps=nil, dir: '.', options: {}, timeline: nil, 
+                  hashtag_url: nil, log: nil, debug: false)
       
-      hashtag_path = File.join(dir, 'hashtag')
-      tagdb = File.join(hashtag_path, 'index.db')
-      FileUtils.mkdir_p File.dirname(tagdb)
+      @sps, @log, @debug = sps, log, debug
       
-      h = {hashtags: {id: '', tag: '', topic: '', noticeid: ''}}
-      @hashtags = RecordxSqlite.new(tagdb, table: h )            
+      # note: a valid url_base must be provided    
+      @options = {
+        url_base: 'http://yourwebsitehere.co.uk/', 
+        dx_xslt: '/xsl/dynarex.xsl', 
+        rss_xslt: '/xsl/feed.xsl', 
+        target_page: :page, 
+        target_xslt: '/xsl/page.xsl',
+        local_media_path: '/home/user/media',
+        url_media_path: 'http://media.yourwebsitehere.co.uk/'
+      }.merge(options)
 
-    end
 
-  end
-
-  def subscribe(topic='notice/*')
-    super(topic)
-  end
-
-  private
+      @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 )            
 
-  def ontopic(topic, msg)
+      end    
+    end
     
-    @log.info 'mns_subscriber/ontopic: topic: ' + topic.inspect if @topic
+    def incoming(topic, msg)
+      
+      a = topic.split('/')
+      context = a.last.to_sym
+      
+      case context
+      when :profile
+            
+        update_attributes(:description, subtopic=a[-2], profile=msg)
 
-    a = topic.split('/')
-    puts "%s: %s %s"  % [topic, Time.now.to_s, msg.inspect]
+      when :link
+        puts 'we have a link' if @debug
+        update_attributes(:link, subtopic=a[-2], link=msg)
+        
+      when :title
+            
+        update_attributes(:title, subtopic=a[-2], title=msg)
+        
+      when :image
+        #puts 'we have an 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
+        puts 'h: ' + h.inspect if @debug
+        
+        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|
+          
+          # is f an Array object containing various sized images of the 1 file?
+          a2 = f.is_a?(Array) ? f : [f]
+          
+          scale = a2.map do |imgfile|
+                  
+            scale = imgfile[/(_\w+)\.\w+$/,1].to_s
+            file = "%s%s%s" % [(id.to_i + i+1).to_s(36).reverse, scale, File.extname(imgfile)]
+            dest = File.join(filepath, file)
+            
+            FileUtils.cp imgfile, dest
+            FileUtils.chmod 0755, dest
+            
+            file
+            
+          end
+          
+          index = scale[1] ? 1 : 0
+          file1 = scale[index]
+          
+          dir = File.extname(file1) =~ /\.(?:jpg|png)/ ? 'images' : ''
+          url = [@options[:url_media_path], dir, file1].join('/')
+      
+          href = [@options[:url_base].sub(/\/$/,''), subtopic, 'status', id, 
+                  'photo', (i+1).to_s ].join('/')
+          # find the best y position for the image letterbox view
+          pct = EasyImgUtils.new(a2[index]).best_viewport
+          pct2 = (pct / 10.0).to_i * 10
+
+          align = if pct < 35 then
+          
+            if pct < 10 then
+              :top
+            else
+              'y' + pct2.to_s
+            end
+            
+          elsif pct >= 70
+            :bottom
+          else
+            #'y' + pct.to_s
+            :center
+          end          
+          
+          {url: url, align: align}
+              
+        end
+        
+        
+        card = if h[:card] and h[:card][:summary_large_image] then
+        
+          h[:card][:summary_large_image][:img] = a[1][:url] if a.any?
+          h[:card]
+          
+        elsif a.any?
+          {images: a}
+        end
+        #puts ('card: ' + card.inspect).debug        
+        
+        h[:msg] += build(card) if card
+        add_notice(subtopic, h[:msg].gsub('<','&lt;')\
+                   .gsub('>','&gt;').gsub("\r",''), id, 
+                   (card ? card.to_json  : nil))
+        
+      else      
+        
+        subtopic, id = a[1..-1]
+        add_notice(subtopic, msg, id)      
+        
+      end
+    end
     
+    private
     
-    case a.last.to_sym
+    def add_notice(topic, raw_msg, raw_id=nil, card=nil)
+
+      @log.info 'mns_subscriber/add_notice: active' if @log
+      topic_dir = File.join(@filepath, 'u', topic)
       
-    when :profile
-          
-      update_attributes(:description, subtopic=a[-2], profile=msg)
+      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)
 
-    when :link
-          
-      update_attributes(:link, subtopic=a[-2], link=msg)
+      t = Time.now
+      id = (raw_id || t.to_i.to_s + t.strftime("%2N")).to_i
       
-    when :title
-          
-      update_attributes(:title, subtopic=a[-2], title=msg)
+      # strip out any JSON from the end of the message
+      msg, raw_json = raw_msg.split(/(?=\{.*)/) 
       
-    when :image
-          
-      update_attributes(:image, subtopic=a[-2], title=msg)      
+      msg = ' ' if msg.nil?
+      mtlite = MTLite.new(msg)
       
-    when :delete
+      desc = if mtlite.to_html(para: false) =~ /<\w+/ then
+        mtlite.to_html(para: true, ignore_domainlabel:true)
+      else
+        mtlite.to_s
+      end
       
-      delete_notice(subtopic=a[-2], msg)
+      if @hashtag_url then
+
+        tags = desc.scan(/(?<= #)\w+/)
+        
+        desc.gsub!(/ #\w+/) do |x| 
+          "<a href='%s%s'>%s</a>" % [@hashtag_url, x[2..-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
       
-    when :json
+      title = mtlite.to_s.lines.first.chomp
+      title = title[0..136] + ' ...' if title.length > 140
       
-      # JSON contains a message and 1 or more media files    
-      h = JSON.parse msg, symbolize_names: true
+      h = {
+        title: title,
+        description: desc,
+        topic: topic,
+        card: card
+      }
+      #puts 'inside add_notice h: ' + h.inspect
+      return_status = notices.add(item: h, id: id.to_s)
+      #puts 'return_status: ' + return_status.inspect
       
-      subtopic = a[-2]
+      return if return_status == :duplicate
       
-      t = Time.now
-      id = t.to_i.to_s + t.strftime("%2N")
+      rxnotices = RecordxSqlite.new(File.join(topic_dir, 'notices.db'),
+        table: {notices: {id: 0, description: '', message: ''}})
       
-      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)
+      begin
+        rxnotices.create id: id.to_s, description: desc, message: msg
+      rescue
+        puts 'warning: rxnotices.create -> ' + ($!).inspect
+      end
+      
+      if raw_json then
         
-        FileUtils.cp f, dest
-        FileUtils.chmod 0755, dest
+        record = JSON.parse(raw_json)
+        index = RecordxSqlite.new(File.join(topic_dir, 'index.db'),
+          table: {items: record})
+        index.create record
+        
+        update_index_xml(index, topic_dir)
         
-        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>" : ''
+      @sps.notice "%s/add: %s/status/%s"  % [@timeline, topic, id] if @timeline
+      
+      sleep 0.3
       
-      add_notice(subtopic, h[:msg] + "\n" + div, id)      
+    end
+    
+    def delete_notice(topic, msg)
+          
+      topic_dir = File.join(@filepath, topic)
       
+      id = msg.to_i
       
-    else
+      feed = DailyNotices.new topic_dir, log: @log  
+      feed.delete id
       
-      subtopic, id = a[1..-1]
-      add_notice(subtopic, msg, id)
+      notices = RecordxSqlite.new(File.join(topic_dir, 'notices.db'), 
+                                  table: 'notices')
+      notices.delete id
       
-    end    
+      indexdb = File.join(topic_dir, 'index.db')
+      
+      if File.exists? indexdb then
+        
+        index = RecordxSqlite.new(indexdb, table: 'items')
+        index.delete id
+        update_index_xml(index, topic_dir)
+      end
+      
+    end
+    
+    # builds the HTML for a given card
+    #
+    def build(card)
 
-  end
+      #return card.inspect
+      #next unless card.is_a? Hash                
+
+      if card.is_a? Hash then
+      
+        card2 = case card.keys.first 
+        when :images
+        
+          card[:images].map.with_index do |img, i|
+          
+            "<img class='img1' src='%s'/>" % img[:url]
+            
+          end.join
+          
+        when :summary_large_image
 
-  def add_notice(topic, raw_msg, raw_id=nil)
+          h2 = card[:summary_large_image]
 
-    @log.info 'mns_subscriber/add_notice: active' if @log
-    topic_dir = File.join(@filepath, 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)
+          rawdesc = h2[:desc]
 
-    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(/(?=\{.*)/) 
-    
-    mtlite = MTLite.new(msg)
-    
-    desc = if mtlite.to_html(para: false) =~ /<\w+/ then
-      mtlite.to_html(para: true, ignore_domainlabel:true)
-    else
-      mtlite.to_s
-    end
-    
-    if @hashtag_url then
+          desc = rawdesc.length > 147 ? rawdesc[0..147] + '...' : rawdesc
+          site = h2[:url][/https?:\/\/([^\/]+)(?=\/)/,1].sub(/^www\./,'')
+          title = h2[:title]
+          img = h2[:img]
+          url = h2[:url]
 
-      tags = desc.scan(/(?<=#)\w+/)
-      
-      desc.gsub!(/#\w+/) do |x| 
-        "<a href='%s%s'>%s</a>" % [@hashtag_url, x[1..-1], x]
+          # The following Card HTML template is for use with the RSS feed. 
+          # The actual HTML template for the card is rendered dynamically 
+          # from the web server. 
+"
+<div class='card'><a href='#{url}' target='_blank'>" + 
+    "<div class='top-crop center'><img src='#{img}'/></div>" + 
+    "<span class='title'>#{title}</span></a><p>#{desc}</p>" + 
+    "<span class='link'><span class='linkurl'>#{site}</span></span></div>"
+
+        end
       end
+
+    end      
+    
+    def update_index_xml(index, topic_dir)
+                              
+      # create the index.xml file
       
-      # 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}
+      a = index.order(:desc).first(15)
+      a2 = a.map {|x| h = x.to_h; id = h.delete(:id); {item_id: id}.merge(h)}
 
-        @hashtags.create h if @hashtags
-        
-      end
+      dx = Dynarex.new    
+      dx.import a2
+      dx.order ='descending'
+      
+      dx.save File.join(topic_dir, 'index.xml')    
       
     end
-    
-    title = mtlite.to_s.lines.first.chomp
-    title = title[0..136] + ' ...' if title.length > 140
-    
-    h = {
-      title: title,
-      description: desc,
-      topic: topic
-    }
 
-    return_status = notices.add(item: h, id: id.to_s)
-    
-    return if return_status == :duplicate
-    
-    rxnotices = RecordxSqlite.new(File.join(topic_dir, 'notices.db'),
-      table: {notices: {id: 0, description: '', message: ''}})
+    def update_attributes(attribute, topic, value)
+      
+      topic_dir = File.join(@filepath, topic)
+      notices = DailyNotices.new topic_dir, @options.merge(identifier: topic)
+      notices.method((attribute.to_s + '=').to_sym).call(value)
+      notices.save
     
-    begin
-      rxnotices.create id: id.to_s, description: desc, message: msg
-    rescue
-      puts 'warning: rxnotices.create -> ' + ($!).inspect
     end
+
     
-    if raw_json then
+  end
+
+  class Client < SPSSub
+
+    def initialize(host: 'sps', port: 59000, dir: '.', options: {}, 
+                  timeline: nil, log: nil, hashtag_url: nil)
       
-      record = JSON.parse(raw_json)
-      index = RecordxSqlite.new(File.join(topic_dir, 'index.db'),
-        table: {items: record})
-      index.create record
+      @log = log
+      log.info 'mns_subscriber/initialize: active' if log
+      @nm = NoticeMgr.new(self, dir: dir, options: options, timeline: timeline, 
+                    hashtag_url: hashtag_url, debug: true)
       
-      update_index_xml(index, topic_dir)
+      super(host: host, port: port, log: log)
       
     end
-    
-    self.notice "%s/add: %s/status/%s"  % [@timeline, topic, id] if @timeline
-    
-    sleep 0.3
-    
-  end
-  
-  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')
-    notices.delete id
-    
-    indexdb = File.join(topic_dir, 'index.db')
-    
-    if File.exists? indexdb then
-      
-      index = RecordxSqlite.new(indexdb, table: 'items')
-      index.delete id
-      update_index_xml(index, topic_dir)
+
+    def subscribe(topic='notice/*')
+      super(topic)
     end
-    
-  end
-  
-  def update_index_xml(index, topic_dir)
-                            
-    # create the index.xml file
-    
-    a = index.order(:desc).first(15)
-    a2 = a.map {|x| h = x.to_h; id = h.delete(:id); {item_id: id}.merge(h)}
 
-    dx = Dynarex.new    
-    dx.import a2
-    dx.order ='descending'
-    
-    dx.save File.join(topic_dir, 'index.xml')    
-    
-  end
+    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]
+      
+      @nm.incoming topic, msg  
+
+    end
 
-  def update_attributes(attribute, topic, value)
-    
-    topic_dir = File.join(@filepath, topic)
-    notices = DailyNotices.new topic_dir, @options.merge(identifier: topic)
-    notices.method((attribute.to_s + '=').to_sym).call(value)
-    notices.save
-  
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mns_subscriber
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,28 +35,28 @@ cert_chain:
   yOAycOYzp7fxmPl3/HV5D0YOJwuy1XslA50GQJwq12A5vMyUGUCHuxH/zKZcM/zr
   0QZaKiVqq5ZeGvni0eQSavhQ
   -----END CERTIFICATE-----
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mtlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: sps-sub
   requirement: !ruby/object:Gem::Requirement
@@ -81,22 +81,22 @@ dependencies:
   name: daily_notices
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: recordx_sqlite
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: easyimg_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 description: 
 email: digital.robertson@gmail.com
 executables: []