noticesys 0.4.0 → 0.5.2

data/lib/noticesys.rb

@@ -18,6 +18,7 @@ require 'recordx_sqlite'
 #   CardView - renders the HTML for a card; used within a status
 #   HashtagQueryView - renders the HTML for the results for a hashtag search
 #   SearchQueryView - renders the HTML for the results for a keyword search
+#   CssView - outputs the default CSS used by the microblog
 
 module NoticeSys
 
@@ -33,29 +34,29 @@ module NoticeSys
 
       # save the file attachments containing the images etc.
 
-      files = (1..3).map do |n| 
-      
+      files = (1..3).map do |n|
+
         f = params['file' + n.to_s]
-        next unless f        
-        
+        next unless f
+
         original = f[:tempfile].to_path
-        
+
         scale_img original
-        
-      end.compact    
-              
+
+      end.compact
+
       msg = params['msg']
 
       urls = msg.scan(/https:\/\/[^ ]+/)
-      
+
       if urls.any? then
 
         h2 = OgExtractor.new(urls.last).to_h
-        
+
         puts 'h2: ' + h2.inspect if @debug
-        
+
         if h2 then
-          h = {msg: msg, files: files}   
+          h = {msg: msg, files: files}
 
           h[:site]= h2[:url][/https?:\/\/([^\/]+)/,1].sub(/^www\./,'')
 
@@ -63,55 +64,55 @@ module NoticeSys
             tmpfile = Down.download h2[:img]
             files2 = scale_img tmpfile.to_path
           end
-          
+
           h[:files] = files2 || []
-          h[:card] = {h2[:card] => { title: h2[:title], desc: h2[:desc], 
+          h[:card] = {h2[:card] => { title: h2[:title], desc: h2[:desc],
                                      url: h2[:url]}}
           h[:msg] = msg.sub(urls.last,'')
 
           return "notice/%s/json: %s" % [@user, h.to_json]
-          
+
         end
-              
-      end    
 
-      return "notice/%s: %s" % [@user, msg]      
+      end
+
+      return "notice/%s: %s" % [@user, msg]
+
+    end
 
-    end 
-    
     private
 
-    def scale_img(raworiginal)    
+    def scale_img(raworiginal)
 
       original = if raworiginal =~ /\.\w+$/ then
-      
+
         raworiginal
-        
+
       else
-      
+
         neworiginal = raworiginal + '.jpg'
         FileUtils.mv raworiginal, neworiginal
         neworiginal
-        
+
       end
-      
-      res = %w(240x240 360x360 *518x389 1280x720 2048x1080)        
+
+      res = %w(240x240 360x360 *518x389 1280x720 2048x1080)
       a = @rmagick.resize(original, res)
       a2 = (a  + [nil,nil,nil]).take(res.length)
 
       oldfile = nil
       sizes = %w(240x240 360x360 small medium large)
-      
+
       file_sizes = a2.zip(sizes).map.with_index do |x, i|
 
         f, label = x
 
-        if f then        
-          
+        if f then
+
           f2 = f.sub(/_(n\d+x\d+)\.\w+$/) {|x| x.sub($1, label)}
 
           FileUtils.mv f, f2
-          oldfile = f2  
+          oldfile = f2
 
         elsif oldfile
 
@@ -122,12 +123,12 @@ module NoticeSys
           FileUtils.cp oldfile, f2
 
         end
-                  
-        
+
+
         f2
 
-      end      
-                      
+      end
+
       imgfile = original.sub(/\.\w+$/,'2\0')
       FileUtils.mv original, imgfile
 
@@ -135,31 +136,31 @@ module NoticeSys
 
     end
 
-  end 
-  
-  
+  end
+
+
   class CardView
-    
+
     def initialize(weblet)
-      
+
       @w = weblet
-      
+
     end
-    
+
     def render(dx, rx, card)
-      
-      card2 = case card.keys.first 
+
+      card2 = case card.keys.first
       when :images
-      
+
         card[:images].map.with_index do |img, i|
-        
-          href = [dx.link.sub(/\/$/,''), rx.topic, 'status', rx.id, 
+
+          href = [dx.link.sub(/\/$/,''), rx.topic, 'status', rx.id,
                   'photo', (i+1).to_s ].join('/')
           url, align = img[:url], img[:align]
           "<a href='%s'><div class='top-crop %s'><img class='img1' src='%s'/></div></a>" % [href, align, url]
-          
+
         end.join
-        
+
       when :summary_large_image
 
         h2 = card[:summary_large_image]
@@ -170,7 +171,7 @@ module NoticeSys
         site = h2[:url][/https?:\/\/([^\/]+)/,1].sub(/^www\./,'')
         title = h2[:title]
         img = h2[:img]
-        url = h2[:url]    
+        url = h2[:url]
 
         @w.render('card', binding)
 
@@ -185,45 +186,48 @@ module NoticeSys
         title = h2[:title].length > 46 ? h2[:title][0..46] + '...' :  h2[:title]
         img = h2[:img]
         url = h2[:url]
-        
-        img_element = if img then 
+
+        img_element = if img then
           "<img src='#{img}'>"
         else
           @w.render('svg/article')
         end
 
-        @w.render('card2', binding)    
-      
+        @w.render('card2', binding)
+
       end
-    end    
+    end
   end
-  
+
   class StatusView
-    
+    include RXFHelperModule
+
     def initialize(basepath, xslfile, css_url, weblet)
-      
+
       @basepath, @xslfile, @css_url = basepath, xslfile, css_url
-      @w = weblet    
+      @w = weblet
       @card = CardView.new(@w)
-      
+
     end
-    
-    def render(topic, rawid, referer)      
+
+    def render(topic, rawid, referer)
 
       id = rawid[0..9].to_i
-      
+
       filepath = File.join(@basepath, 'u', topic)
       a = [Time.at(id).strftime("%Y/%b/%-d").downcase, rawid]
       xmlfile = File.join(filepath, "%s/%s/index.xml" % a)
       xslfile = File.join(@basepath, "/xsl/notices/#{topic}.xsl")
-      
+
       unless File.exists? xslfile then
         xslfile = @xslfile
       end
 
       dx = Dynarex.new(File.join(filepath, 'feed.xml'))
-      doc = Rexle.new(File.read(xmlfile))
-            
+      s = FileX.read(xmlfile)
+
+      doc = Rexle.new(s.force_encoding("UTF-8"))
+
       doc.root.element('summary/title').text = dx.title
       e = doc.root.element('summary/image')
 
@@ -231,112 +235,148 @@ module NoticeSys
         e = Rexle::Element.new 'image'
         doc.root.element('summary').add e
       end
-      
+
       doc.root.element('summary/image').text = dx.image
-      
+
       # remove the card from the description
       desc = doc.root.element('body/description')
       desc.xpath('img|div').each(&:delete)
 
       doc   = Nokogiri::XML(doc.root.xml)
-      xslt  = Nokogiri::XSLT(File.read(xslfile))
+      xslt  = Nokogiri::XSLT(FileX.read(xslfile))
 
       s = xslt.transform(doc)
       doc = Rexle.new(s.to_s)
-     
-      rx = Kvx.new(xmlfile)                        
+
+      rx = Kvx.new(xmlfile)
 
       rawcard = rx.card
 
 
       card2, meta = if rawcard and rawcard.length > 10 then
-      
+
         card = JSON.parse(rawcard, symbolize_names: true)
-        
-        if card.is_a? Hash then      
-              
+
+        if card.is_a? Hash then
+
           type = card.keys.first
           h = card[type]
           #img = h[:img].sub(/small(?=\.\w+$)/,'large')
           img = h[:img]
           metadata = @w.render(:meta, binding)
           [@card.render(dx, rx, card), metadata]
-          
+
         end
       else
         '<span/>'
       end
-      
+
 
       e = doc.root.at_css '#notice'
       desc = e.at_css '#desc'
-      desc.add Rexle.new(card2).root      
+      desc.add Rexle.new(card2).root
 
       ref =  referer
       svg = @w.render 'svg/backarrow', binding
-      
+
       back = if ref then
         "<div id='back'><a href='#{ref}' title='back'>#{svg}</a></div>"
       else
-        ''            
+        "<div id='back'><a href='/' title='back'>#{svg}</a></div>"
       end
-      
+
       @w.render :status, binding
 
     end
-    
+
+  end
+
+  class CssView
+
+    def initialize(weblet_file)
+
+      @weblet_file = weblet_file
+
+    end
+
+    def noticelist_css()
+
+      w = Weblet.new(@weblet_file)
+
+      lines = []
+      lines << w.render(:main)
+      lines << w.render('main/user')
+      lines << w.render(:notice)
+      lines << w.render('notice/cards')
+      lines << w.render('main/noticelist')
+      lines << w.render('main/footer')
+      lines.join("\n")
+
+    end
+
+    def notice_css()
+
+      w = Weblet.new(@weblet_file)
+
+      lines = []
+      lines << w.render(:status)
+      lines << w.render(:cards)
+      lines.join("\n")
+
+    end
+
   end
-  
+
   class NoticeView
-    
+
     def render()
     end
-    
+
   end
 
-  
+
   class StatusListView
-    
+
     def initialize(basepath, css_url, static_urlbase, weblet)
-      
+
       @basepath, @css_url, @static_urlbase = basepath,  css_url, static_urlbase
       @w = weblet
       @card = CardView.new(@w)
-      
+
     end
-    
-    def render(username)      
+
+    def render(username)
 
       s = ''
-      
+
       dx = Dynarex.new(File.join(@basepath, 'u', username, 'feed.xml'))
-      
+
       s += @w.render 'user/ptop', binding
-      
+
       notices = dx.all.map do |rx|
-      
+
         card2 = ''
-        rawcard = rx.to_h[:card]                
-        
+        rawcard = rx.to_h[:card]
+
         card2 = if rawcard and rawcard.length > 10 then
-        
-          card = JSON.parse(rawcard, symbolize_names: true)             
-          
-          if card.is_a? Hash then            
+
+          card = JSON.parse(rawcard, symbolize_names: true)
+
+          if card.is_a? Hash then
             @card.render(dx, rx, card)
           end
-          
+
         else
           ''
-        end      
-      
+        end
+
         t2 = Time.at rx.id.to_s[0..9].to_i
         relative_time = Unichron.new(t2).elapsed
-        
+
         d = t2.strftime("%I:%M%p %b %d %Y")
-        
+
         description = if rx.description.length > 1 then
-          doc = Rexle.new "<node>%s</node>" % rx.description.gsub(/<\/?p>/,'')                    
+          doc = Rexle.new "<node>%s</node>" % rx.description.gsub(/<\/?p>/,'')
           doc.root.xpath('img|div').each(&:delete)
           "<p>%s</p>" % doc.root.xml
         else
@@ -345,39 +385,45 @@ module NoticeSys
 
         utitle, uimage, ubio = dx.title, dx.image, dx.bio
         @w.render :notice, binding
-        
+
       end
 
-      s += notices.join      
-      s += @w.render 'user/rsslink', binding                  
+      s += notices.join
+      s += @w.render 'user/rsslink', binding
       @w.render :user, binding
-      
+
     end
   end
-    
+
   class HashtagQueryView
-    
-    def initialize(basepath, css_url, weblet, static_urlbase, urlbase)
-      
+
+    def initialize(basepath, db_basepath, css_url, weblet, static_urlbase,
+                   urlbase, debug: false)
+
       @basepath, @css_url, @static_urlbase = basepath,  css_url, static_urlbase
-      @w, @urlbase = weblet, urlbase
+      @db_basepath, @w, @urlbase, @debug = db_basepath, weblet, urlbase, debug
       @card = CardView.new(@w)
-      
+
     end
-    
-    def render(q, referer)      
-      #q = args.first    
-      dbpath = File.join(@basepath, '/hashtag/index.db')
-      db = RecordxSqlite.new(dbpath, table: 'hashtags')
-   
-      
+
+    def render(q, referer)
+      #q = args.first
+      dbindex_path = File.join(@db_basepath, '/hashtag/index.db')
+      puts 'dbindex_path: ' + dbindex_path.inspect if @debug
+
+      db = RecordxSqlite.new(dbindex_path, table: 'hashtags')
+
+
       a = db.find_all_by_tag q
 
-      topics = a.map(&:topic).uniq.map do |topic|  
+      topics = a.map(&:topic).uniq.map do |topic|
 
         topicpath = File.join(@basepath, 'u', topic)
-        filepath = File.join(topicpath, "notices.db")
-        db = RecordxSqlite.new(filepath, table: 'notices')
+        topic_db_path = File.join(@db_basepath, 'u', topic)
+
+        db_filepath = File.join(topic_db_path, "notices.db")
+        puts 'db_filepath: ' + db_filepath.inspect if @debug
+        db = RecordxSqlite.new(db_filepath, table: 'notices')
 
         dx = Dynarex.new(File.join(topicpath, 'feed.xml'))
         [topic, OpenStruct.new(title: dx.title, image: dx.image, db: db)]
@@ -390,92 +436,93 @@ module NoticeSys
         r = topics[x.topic]
         rx = r.db.find x.noticeid
         link = "%s/%s/status/%s" % [@urlbase, x.topic, x.noticeid]
-        OpenStruct.new(rx.to_h.merge({topic: x.topic, title: r.title, 
+        OpenStruct.new(rx.to_h.merge({topic: x.topic, title: r.title,
                                       image: r.image, bio: r.bio, link: link}))
 
       end
-      
-      
+
+
       s = ''
-      
+
       notices = rows.sort_by {|x| -(x.id.to_i)}.take(20).map do |rx|
-      
+
         next unless rx.description
-                
+
         card2 = ''
-        rawcard = rx.to_h[:card]                
-        
+        rawcard = rx.to_h[:card]
+
         card2 = if rawcard and rawcard.length > 10 then
-        
-          card = JSON.parse(rawcard, symbolize_names: true)             
-          
-          if card.is_a? Hash then            
+
+          card = JSON.parse(rawcard, symbolize_names: true)
+
+          if card.is_a? Hash then
             @card.render(dx, rx, card)
           end
-          
+
         else
           ''
-        end   
-        
+        end
+
         t2 = Time.at rx.id.to_s[0..9].to_i
         relative_time = Unichron.new(t2).elapsed
-        
+
         d = t2.strftime("%I:%M%p %b %d %Y")
-        
+
         description = if rx.description.length > 1 then
-          doc = Rexle.new "<node>%s</node>" % rx.description.gsub(/<\/?p>/,'')                    
+          doc = Rexle.new "<node>%s</node>" % rx.description.gsub(/<\/?p>/,'')
           doc.root.xpath('img|div').each(&:delete)
           "<p>%s</p>" % doc.root.xml
         else
           ''
-        end        
+        end
 
         utitle, uimage, ubio = rx.title, rx.image, rx.bio
         @w.render :notice, binding
-        
-      end    
-      
+
+      end
+
       s += if notices.any? then
-        notices.compact.join      
+        notices.compact.join
       else
         "<p>No results for #{q}</p>"
       end
-      
+
       ref = referer
-      ref = '../' if ref =~ /(?:status|hashtag)\/\d+/      
-      
+      ref = '../' if ref =~ /(?:status|hashtag)\/\d+/
+
       svg = @w.render 'svg/backarrow', binding
       back = ref ? "<a href='#{ref}'>#{svg}</a>" : ''
-            
+
       @w.render :search_pg, binding
-      
+
     end
-    
-    
+
+
   end
-  
+
   class SearchQueryView
-    
-    def initialize(basepath, css_url, weblet, static_urlbase, urlbase)
-      
+
+    def initialize(basepath, db_basepath, css_url, weblet, static_urlbase, urlbase)
+
       @basepath, @css_url, @static_urlbase = basepath,  css_url, static_urlbase
-      @w, @urlbase = weblet, urlbase
+      @db_basepath, @w, @urlbase = db_basepath, weblet, urlbase
       @card = CardView.new(@w)
-      
+
     end
-    
-    def render(q, referer)      
-      
+
+    def render(q, referer)
+
 
       users = Dir.glob(File.join(@basepath, 'u', '*')).map do |x|
         File.basename(x)
       end
 
-      topics = users.map do |topic|  
+      topics = users.map do |topic|
 
         topicpath = File.join(@basepath, 'u', topic)
-        filepath = File.join(topicpath, "notices.db")
-        db = RecordxSqlite.new(filepath, table: 'notices')
+        topic_db_path = File.join(@db_basepath, 'u', topic)
+        db_filepath = File.join(topic_db_path, "notices.db")
+        db = RecordxSqlite.new(db_filepath, table: 'notices')
 
         dx = Dynarex.new(File.join(topicpath, 'feed.xml'))
         [topic, OpenStruct.new(title: dx.title, image: dx.image, bio: dx.bio, db: db)]
@@ -485,104 +532,125 @@ module NoticeSys
       #return topics.inspect
       rows = topics.flat_map do |topic, r|
 
-        a = r.db.all.select {|x| x.description =~ /#{q}/i}
+        a = r.db.all.select {|x| x.description =~ /#{q.gsub('$',"\\$")}/i}
         a.map do |rx|
           link = "%s/%s/status/%s" % [@urlbase, topic, rx.noticeid]
           OpenStruct.new(rx.to_h.merge({topic: topic, title: r.title, image: r.image, link: link}))
         end
 
       end
-      
-      
-      #return rows.inspect      
+
+
+      #return rows.inspect
       s = ''
-      
+
       notices = rows.sort_by {|x| -(x.id.to_i)}.take(20).map do |rx|
-      
-        
+
+
         card2 = ''
-        rawcard = rx.to_h[:card]                
-        
+        rawcard = rx.to_h[:card]
+
         card2 = if rawcard and rawcard.length > 10 then
-        
-          card = JSON.parse(rawcard, symbolize_names: true)             
-          
-          if card.is_a? Hash then            
+
+          card = JSON.parse(rawcard, symbolize_names: true)
+
+          if card.is_a? Hash then
             @card.render(dx, rx, card)
           end
-          
+
         else
           ''
-        end   
-        
+        end
+
         #rx.description
         t2 = Time.at rx.id.to_s[0..9].to_i
         relative_time = Unichron.new(t2).elapsed
-        
+
         d = t2.strftime("%I:%M%p %b %d %Y")
-        
+
         #desc = rx.description.gsub(/<\/?p>/,'').gsub('&lt;','<').gsub('&gt;','>')
-        
+
         topic = rx.topic
         title, image, bio = %i(title image bio).map do |x|
           topics[topic].method(x).call
         end
-        
+
         description = if rx.description.length > 1 then
-          doc = Rexle.new "<node>%s</node>" % rx.description.gsub(/<\/?p>/,'')                    
+          doc = Rexle.new "<node>%s</node>" % rx.description.gsub(/<\/?p>/,'')
           doc.root.xpath('img|div').each(&:delete)
           "<p>%s</p>" % doc.root.xml
         else
           ''
-        end            
-                
+        end
+
         utitle, uimage, ubio = title, image, bio
         @w.render :notice, binding
 
 
       end
       #return notices.inspect
-      
+
       s += if notices.any? then
-        notices.join      
+        notices.join
       else
         "<p>No results for #{q}</p>"
       end
-      
+
       #ref =  @env["HTTP_REFERER"]
       ref = referer
       ref = '../' if ref =~ /(?:status\/\d+|search)/
       svg = @w.render 'svg/backarrow', binding
-      back = ref ? "<a href='#{ref}'>#{svg}</a>" : ''      
-      
+      back = ref ? "<a href='#{ref}'>#{svg}</a>" : "<a href='/'>#{svg}</a>"
+
       @w.render :search_pg, binding
-      
-      
+
+
     end
-    
-    
-  end  
-  
+
+
+  end
+
   class Main
-    
-    def initialize(basepath, xslfile, statuscss_url, statuslistcss_url, 
-                   weblet_file, static_urlbase, urlbase)
-      
-      weblet = Weblet.new(weblet_file)      
+
+    def initialize(basepath, db_basepath, xslfile, statuscss_url,
+                   statuslistcss_url, weblet_file, static_urlbase,
+                   urlbase, weblet_cssfile, debug: false)
+
+      weblet_file ||= File.join(File.dirname(__FILE__), '..',
+                                'data', 'microblog.txt')
+
+      weblet = Weblet.new(weblet_file)
+
       @status = StatusView.new(basepath, xslfile, statuscss_url, weblet)
-      @statuslist = StatusListView.new(basepath, statuslistcss_url, 
+
+      @statuslist = StatusListView.new(basepath, statuslistcss_url,
                                        static_urlbase, weblet)
-      @hashtag = HashtagQueryView.new(basepath, statuslistcss_url, weblet, 
-                                      static_urlbase, urlbase)
-      @search = SearchQueryView.new(basepath, statuslistcss_url, weblet, 
-                                      static_urlbase, urlbase)
-      
+
+      @hashtag = HashtagQueryView.new(basepath, db_basepath,
+                                      statuslistcss_url, weblet,
+                                      static_urlbase, urlbase, debug: debug)
+
+      @search = SearchQueryView.new(basepath, db_basepath, statuslistcss_url,
+                                    weblet, static_urlbase, urlbase)
+
+      weblet_cssfile ||= File.join(File.dirname(__FILE__), '..',
+                                'data', 'css.txt')
+      @css = CssView.new(weblet_cssfile)
+
     end
-    
+
+    def notice_css()
+      @css.notice_css()
+    end
+
+    def noticelist_css()
+      @css.noticelist_css()
+    end
+
     def status(topic, rawid, referer)
       @status.render topic, rawid, referer
     end
-    
+
     def status_list(username)
       @statuslist.render username
     end
@@ -590,11 +658,12 @@ module NoticeSys
     def hashtag_query(s, referer)
       @hashtag.render s, referer
     end
-    
+
     def search_query(s, referer)
       @search.render s, referer
-    end    
-    
+    end
+
+
   end
-    
-end 
+
+end