mns_subscriber 0.6.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba7ffb83b3ae3627fe99ba11f1d3c6ca5b20beadf702ba658bf87a596a877dbb
-  data.tar.gz: 5070727cf3f6443a3653edfa9cee25a81fbdb7a91a9253a72a42a8a7fa122ecb
+  metadata.gz: d423aeed6fde9fb4b40f93118cdd02873b3d1c06725b03be6b85c39d854e1e41
+  data.tar.gz: 48073f7faea2f5874fb85ec995751196829a24c64f0b0a8813933fc61d9b2e55
 SHA512:
-  metadata.gz: 8773c8013caf65d54f7bb8a75543e5826f47a46c92235f4ea9766ea095f8cdcca4ae256ea9c65e8ef112f597eb8e5c46fb46d25b7a14d016d71630d6216b4fe2
-  data.tar.gz: 448558190b8e5082a8226cdf617b7c572a9125c6f57e2d5e9566f31bcc20b06e536ffeb5d1f334275f21cc0b3a1410ceaa1b143f3e26c589e383f3bffe45abf3
+  metadata.gz: 72a1b222c7f4093c7f94b76c806b17d503645536fdb8b0bd7f024190274ea8e85ae85d0b22564e5cd33a2e158fc339315a66a9c0cd04ea8cc4cd1506691b94e1
+  data.tar.gz: 177387347a89ef47d2f927a7f34eb24a922c63b151d642912ac85a2a7b731315c4512c385e43880df50f97bc45659769f8214a9186948863cbe58343189ad3a0

data/lib/mns_subscriber.rb

@@ -7,216 +7,454 @@ 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'      
-    }.merge(options)
-
-    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 )            
+module MNSSubscriber
 
+  class NoticeMgr
+    include RXFHelperModule
+    using ColouredText
+
+    def initialize(sps=nil, dir: '.', db_path: '.', options: {}, timeline: nil,
+                  hashtag_url: nil, log: nil, debug: false)
+
+      @sps, @log, @debug = sps, log, debug
+
+      # 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)
+
+
+      @filepath, @db_path, @timeline = dir, db_path, 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(db_path, 'hashtag', 'index.db')
+        tagdb_dir = File.join(hashtag_path, 'index.db')
+        FileX.mkdir_p File.dirname(tagdb_dir)
+
+        h = {hashtags: {id: '', tag: '', topic: '', noticeid: ''}}
+        @hashtags = RecordxSqlite.new(tagdb, table: h )
+
+      end
     end
 
-  end
+    def incoming(topic, msg)
 
-  def subscribe(topic='notice/*')
-    super(topic)
-  end
+      a = topic.split('/')
+      context = a.last.to_sym
 
-  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]
-    
-    
-    case a.last.to_sym
-      
-    when :profile
-          
-      update_attributes(:description, subtopic=a[-2], profile=msg)
-
-    when :link
-          
-      update_attributes(:link, subtopic=a[-2], link=msg)
-      
-    when :title
-          
-      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)
-      
-    else
-      
-      subtopic, id = a[1..-1]
-      add_notice(subtopic, msg, id)
-      
-    end    
+      case context
+      when :profile
 
-  end
+        #update_attributes(:description, subtopic=a[-2], profile=msg)
+        h = JSON.parse msg, symbolize_names: true
+        update_profile(subtopic=a[-2], h)
+
+      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)
+
+            FileX.cp imgfile, dest
+            FileX.chmod 0755, dest
+
+            file
+
+          end
+
+          puts 'scale: ' + scale.inspect
+          index = scale[2] ? 2 : (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
 
-  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)
-
-    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
+          {url: url, align: align}
+
+        end
+
+
+        card = if h[:card] then
+
+          puts 'h[:card]: ' + h[:card].inspect
+          puts 'a: ' + a.inspect
+
+          if h[:card][:summary_large_image] then
+
+            h[:card][:summary_large_image][:img] = a[2][:url] if a.any?
+            h[:card]
+
+          elsif h[:card][:summary]
+
+            h[:card][:summary][:img] = a[0][:url] if a.any?
+            h[:card]
+
+          end
+
+        elsif a.any?
+          {images: a}
+        end
+        puts 'before build'
+        #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
-    
-    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]
+    private
+
+    def add_notice(topic, raw_msg, raw_id=nil, card=nil)
+
+      @log.info 'mns_subscriber/add_notice: active' if @log
+
+      if @log then
+        @log.debug 'mns_subscriber/add_notice: @db_path:' + @db_path.inspect
       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
-        
+      topic_dir = File.join(@filepath, 'u', topic)
+      topic_db_dir = File.join(@db_path, 'u', 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
+      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(/(?=\{.*)/)
+
+      msg = ' ' if msg.nil?
+      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
+
+        tags = desc.scan(/(?<= #)\w+/)
+
+        desc.gsub!(/ [#\$][a-zA-Z]\w+/) do |rawx|
+
+          x = rawx.lstrip
+          baseurl = x[0] == '#' ? @hashtag_url : 'search?q='
+          url = baseurl + CGI.escape(x.sub(/^#/,''))
+          " <a href='%s'>%s</a>" % [url, 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
+
+      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
+
+      return if return_status == :duplicate
+
+      rxnotices = RecordxSqlite.new(File.join(topic_db_dir, 'notices.db'),
+        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
+
+        record = JSON.parse(raw_json)
+        index = RecordxSqlite.new(File.join(topic_db_dir, 'index.db'),
+          table: {items: record})
+        index.create record
+
+        update_index_xml(index, topic_dir)
+
+      end
+
+      @sps.notice "%s/add: %s/status/%s"  % [@timeline, topic, id] if @timeline
+
+      sleep 0.3
+
     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: ''}})
-    
-    begin
-      rxnotices.create id: id.to_s, description: desc, message: msg
-    rescue
-      puts 'warning: rxnotices.create -> ' + ($!).inspect
+
+    def delete_notice(topic, msg)
+
+      topic_dir = File.join(@filepath, topic)
+      topic_db_dir = File.join(@db_path, topic)
+
+      id = msg.to_i
+
+      feed = DailyNotices.new topic_dir, log: @log
+      feed.delete id
+
+      notices = RecordxSqlite.new(File.join(topic_db_dir, 'notices.db'),
+                                  table: 'notices')
+      notices.delete id
+
+      indexdb = File.join(topic_db_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
-    
-    if raw_json then
-      
-      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)
-      
+
+    # builds the HTML for a given card
+    #
+    def build(card)
+      puts 'inside build'
+
+      #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
+
+          h2 = card[:summary_large_image]
+
+          rawdesc = h2[:desc]
+
+          desc = rawdesc.length > 147 ? rawdesc[0..147] + '...' : rawdesc
+          site = h2[:url][/https?:\/\/([^\/]+)/,1].sub(/^www\./,'')
+          title = h2[:title]
+          img = h2[:img]
+          url = h2[:url]
+
+          # 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>"
+
+        when :summary
+
+          h2 = card[:summary]
+          puts 'h2: ' + h2.inspect
+          rawdesc = h2[:desc]
+
+          desc = rawdesc.length > 120 ? rawdesc[0..120] + '...' : rawdesc
+          site = h2[:url][/https?:\/\/([^\/]+)(?=\/)/,1].sub(/^www\./,'')
+          title = h2[:title]
+          img = h2[:img]
+          url = h2[:url]
+
+          # 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='card2'><a href='#{url}' target='_blank'><div><div id='col1'>" +
+    "<img src='#{img}'></div><div id='col2'><div id='content'>" +
+    "<span class='title'>#{title}</span><span class='desc'>#{desc}</span>" +
+    "<span class='link'><span class='linkurl'>#{site}</span></span></div>" +
+    "</div></div></a></div>"
+
+        end
+      end
+
     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)
-    
-    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')
-    
-    if File.exists? indexdb then
-      
-      index = RecordxSqlite.new(indexdb, table: 'items')
-      index.delete id
-      update_index_xml(index, topic_dir)
+
+    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
-    
-  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')    
-    
+
+    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
+
+    def update_profile(topic, h)
+
+      topic_dir = File.join(@filepath, topic)
+      notices = DailyNotices.new topic_dir, **@options.merge(identifier: topic)
+
+      valid_keys = %i(title identifier image bio location website banner_image)
+
+      h.each_pair do |key, value|
+
+        next unless valid_keys.include? key
+
+        attribute = key.to_s
+        notices.method((attribute + '=').to_sym).call(value)
+
+      end
+
+      notices.save
+
+    end
+
+
   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
-  
+  class Client < SPSSub
+
+    def initialize(host: 'sps', port: 59000, dir: '.', db_path: '.',
+                   options: {}, timeline: nil, log: nil, hashtag_url: nil)
+
+      @log = log
+      log.info 'mns_subscriber/initialize: active' if log
+      @nm = NoticeMgr.new(self, dir: dir, db_path: db_path, options: options, timeline: timeline,
+                    hashtag_url: hashtag_url, log: log, debug: true)
+
+      super(host: host, port: port, log: log)
+
+    end
+
+    def subscribe(topicx='notice/*', topic: topicx)
+      super(topic: topic)
+    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
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mns_subscriber
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,28 +35,28 @@ cert_chain:
   yOAycOYzp7fxmPl3/HV5D0YOJwuy1XslA50GQJwq12A5vMyUGUCHuxH/zKZcM/zr
   0QZaKiVqq5ZeGvni0eQSavhQ
   -----END CERTIFICATE-----
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2022-01-19 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.3
   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.3
 - !ruby/object:Gem::Dependency
   name: recordx_sqlite
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -116,9 +116,29 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.3
+- !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.4
+  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.4
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []