mtlite 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ad72548b1d62cf4ae3af016f02824293b60dd03562902ffe36219df39197ffb
-  data.tar.gz: 5fb92f9b5a325a5638027ae704f3d33b1cf75ee05227268206c9b5f431bd9ad8
+  metadata.gz: 287458fbd384815faecca342f0b7138ad8c8efcd32e2fbc593d15dc62c120693
+  data.tar.gz: 568dae5601d898528f8fb497c494d1a72171d4216e2552273e3c5c65d14660ba
 SHA512:
-  metadata.gz: 4f364bdc994d39b8fb0202830ff74af6ebf5b10e72d66d447e132871158fd9fdb130a3f0441781818550f23f93604bb781aa361d96d26dda8138d6fc34201afb
-  data.tar.gz: b4ea6f85c444e48ef708320d67bd84bc896c45e187ffe9dbba0880c0cb05c306baeec0d7e2704f395b9a41b979d3818dbf393e701349951192b88176427ccd53
+  metadata.gz: 992fae9a36ca694d417312360e01e34efeb0a639b3d5cd5475da38dc779a19a68206eb802b1e7dc0c742aaf15809178526af7764ce5ab189bfa98a7d5c576819
+  data.tar.gz: 38ce325e7523ac459a05f4a69a77bb7657c0af9fa1c41f50fce35e11f66426e64de846d38bc70340401b4c7cf33caee2c13f259c9ba99a0da1f434a1aa6ed9e5

data/lib/mtlite.rb

@@ -7,16 +7,25 @@ require 'embiggen'
 
 class MTLite
   
-  def initialize(raw_msg)
+  def initialize(raw_msg, debug: false)
 
+    @debug = debug
+    
     # reveal the expanded URL from a shortened URL
-    raw_msg.gsub!(/https?:\/\/[\w\-_\.\/?+&]+/) do |url|      
+    raw_msg.gsub!(/https?:\/\/[^ ]+/) do |url|      
+      
+      puts 'url: ' + url.inspect if @debug
+      
       Embiggen::URI(url).expand.to_s
     end
     
+    puts 'raw_msg: ' + raw_msg.inspect if @debug
+    
     # make the smartlinks into Markdown links        
     @raw_msg = smartlink(raw_msg)
     
+    puts '@raw_msg: '  + @raw_msg.inspect if @debug
+    
   end
 
   def to_html(para: false, ignore_domainlabel: false)
@@ -81,12 +90,14 @@ class MTLite
     msg = RDiscount.new(raw_msg).to_html
     msg.gsub!(/<\/?p[^>]*>/,'') unless para
 
-    regex = %r([\w\-/?=.#\(\)]+)
+    regex = %r([^ <]+)
     # generate anchor tags for URLs which don't have anchor tags
     msg.gsub!(/(?:^(https?:#{regex})|\s(https?:#{regex}))/,' <a href="\2">\2</a>')    
     
     msg.gsub!(/(?<=\>)https?:#{regex}/) do |x|
-      url = x
+      
+      # unescapeHTML will transform &amp; to &
+      url = CGI.unescapeHTML x
       url2 = url.sub(/^https?:\/\//,'').sub(/^www\./,'')
       url3 = url2.length > 33 ? url2[0..33] + '...' : url2
       #" <a href='#{url}'>#{url3}</a>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtlite
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   RpkfFZne43vM6SRQRvmVREEMpk57Mub1ccA9v5eElBuZbfyEO5eMYSc88DkxHCkr
   sfZbXuL/o5TgPyPL7UYvUyoJ
   -----END CERTIFICATE-----
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount