mtlite 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1fe272c364de630b9fd4e08b7db84e122759779b
-  data.tar.gz: 1ff4890279d3ea7312b775f0eae504c6009ef5ed
+SHA256:
+  metadata.gz: 287458fbd384815faecca342f0b7138ad8c8efcd32e2fbc593d15dc62c120693
+  data.tar.gz: 568dae5601d898528f8fb497c494d1a72171d4216e2552273e3c5c65d14660ba
 SHA512:
-  metadata.gz: 2a53ec71e7c5515a496ad92eb0d589bc03e90c7365431862b2dbcc2e77e6a98754dbb66aea2c761d03163ac17343a555b7f4d2f8e501551cfe8089e42e02b624
-  data.tar.gz: 61032a89070362c30c215f57c1f8f34c6fa4fda1379dc7d44774508c17b471d0af276cde04ab376696c211032bd257471540d3e4742d86ec8145973b6eaa33ec
+  metadata.gz: 992fae9a36ca694d417312360e01e34efeb0a639b3d5cd5475da38dc779a19a68206eb802b1e7dc0c742aaf15809178526af7764ce5ab189bfa98a7d5c576819
+  data.tar.gz: 38ce325e7523ac459a05f4a69a77bb7657c0af9fa1c41f50fce35e11f66426e64de846d38bc70340401b4c7cf33caee2c13f259c9ba99a0da1f434a1aa6ed9e5

data/lib/mtlite.rb

@@ -7,19 +7,28 @@ 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()
+  def to_html(para: false, ignore_domainlabel: false)
 
     raw_msg = @raw_msg.clone    
     # if it looks like an MtLite list make it an MtLite list
@@ -37,7 +46,7 @@ class MTLite
     # convert square brackets to unicode check boxes
     # replaces a [] with a unicode checkbox, 
     #                         and [x] with a unicode checked checkbox
-    raw_msg = raw_msg.gsub(/\[\s*\]/,'☐').gsub(/\[x\]/,'☑')
+    raw_msg = raw_msg.gsub(/\[\s*\](?= )/,'☐').gsub(/\[x\]/,'☑')
 
     # convert fractions using their associated unicode character
     # i.e. 1/4, 1/2, 3/4 
@@ -50,11 +59,15 @@ class MTLite
       x.sub(/-([&\w]+.*\w+)-/,'<del>\1</del>')
     end
       
-    # append a domain label after the URL
-    raw_msg.gsub!(/(?:^\[|\s\[)[^\]]+\]\((https?:\/\/[^\s]+)/) do |x|
-      s2 = x[/https?:\/\/([^\/]+)/,1].split(/\./)
-      r = s2.length >= 3 ? s2[1..-1] :  s2
-      "%s [%s]" % [x, r.join('.')]
+    unless ignore_domainlabel then
+      
+      # append a domain label after the URL
+      raw_msg.gsub!(/(?:^\[|\s\[)[^\]]+\]\((https?:\/\/[^\s]+)/) do |x|
+        s2 = x[/https?:\/\/([^\/]+)/,1].split(/\./)
+        r = s2.length >= 3 ? s2[1..-1] :  s2
+        "%s [%s]" % [x, r.join('.')]
+      end
+      
     end
     
     # generate html lists from mtlite 1-liner lists
@@ -74,11 +87,22 @@ class MTLite
 
     end
 
-    msg = RDiscount.new(raw_msg).to_html.gsub(/<\/?p[^>]*>/,'')
+    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|
+      
+      # 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>"
+    end
+
     # add the target attribute to make all hyperlinks open in a new browser tab
     msg.gsub!(/<a /,'<a target="_blank" ')
     
@@ -129,4 +153,4 @@ class MTLite
 
   end  
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtlite
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MDYyNDExMDkzNVoXDTE3MDYyNDExMDkzNVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALUiATNMjBlFX846paTxxwPtEe3kZRWsyaJ4b0LuB1JAkHbr1Lb/uSKEo/80
-  n5+gK3eqtyZMICFwx6kKhVIqcab8R11csvf3yfzxnCRgYQMElbhMYgEsracuSVqr
-  8gSmpyYtFtbr85/yICepBYDyQNVvtqCvILCVu69PWwFr+vdfY3Ioz+6US2Tlos/E
-  tJsEC+k2LjSzKQtNTXVun/mjEb/UJeTDZCbt4WnsMPgagGcrF2BNvjLAjvSQvn1r
-  qOCQh2J+rPL/TqMtHsOdoxq67KMKijB7HjrMoV5rq6Ik1HgHnzQl1rpqijjzee6m
-  AgHmBtw3OzATCAcxJhKQLdLUFZsCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUZrOh1bgLLQVr07/6Y+IKQyrXzfgwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAR69dx+Xd
-  f38+o+olOt7yaTtOLS8n9uLbZM94ciGCYEabKMUlgA+PofBaFOYPd+rRanDOB2SL
-  ryiG7AanPgEZukcbIC9bN2KfOCcaNGPHiWdXSzQwrrJq4hTvx+6MqsujObwSXMBP
-  8AsCMDIA/5/ML4q7Fdh0fM0iV4hyhpLSa7zsSKAykjBVrlV/eBFKgXU6pHGvCLMJ
-  pBirURRkelsDu2rGEv8Xfosm72CIuxUi8c45bffrmmrgl/PfE5zCnNhtdBYgQBLI
-  S/vdVb30GmSKtbnJ5lgMXRzFppdweZQMOoEbtLfL7ine6Ty5MxOq7FSffEov7+T9
-  1nXp7z0aRWQE3g==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMjIzMTQ1MzMwWhcN
+  MjIwMjIzMTQ1MzMwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDPICvX
+  ekFtCC7T84fjH1kM3eAgM4M8+0D/nWMUTL+aZjmNJUhnknZLGX+ltHYMoj+1jX8E
+  x0HJqxkKpbOmr1oIj6/iF6Ns1bOamtn9qin5fpvfk6Db9e33Wb0qsC4iNy6IWCEW
+  azjrGhBaKrawH/qTIHVpzRqhGAwjDslsT8WEXjMGppRFmQqXoBh/gKa17AuZx1Kb
+  oLS1xfdKa8cnRCyMvNfD3tBWxTuQ04lY2IfIuuB2/O4iWs3CvtD2QQI/XC4poDG4
+  Fgcocl21w5ALwN33m/5PbA0adYn+wxy9vPwJ45xB10pjB7FYlBK4BBcb8hylUEP2
+  OEQqx8MDeTCCUBdz9/cZY4SdpBur6YYmvwth2fFG3dDjQa0RA/JnmanECPdV17jQ
+  342UQRcsPBrq0B5//HjdiS7xOFFP/Lec4B1NLD9tnyrbCQsC1asUwhyTKnZN6Gv4
+  ZoOFAEpBN8pHUX7R0zZB0OpwY+HxV7FWvKAiOaKfpHZ8VL20PpWMi7DZ2Q0CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUUdTDzYti
+  v2oK6sH4SxOAL4wBGhIwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAkc9hOBwHoSh3zxQqUT0L1U7A3qrPgL9v3zHVJj7v
+  b8lfFtTAZ70yFnmjhDKKJezTxGOg/4gbxskiO4Kf2jdKwV4Of43N9Ag6YCrz5eA5
+  6inRvvjKOnXYdO22Y/eAPTficdlkj5QZw0Qe9Zd9WxhjDWulBaToqwdrZdeeq0/s
+  mWYzhQYWrPOS8ozdFSlcAG/QED7txpx50dYzrcafL7oP83wM2bAX4XtZIqbOgZft
+  iSNANuPrW+VhvqGo3M8+f+5yYYyS67whR5w85z9TcUT+dPyTGYl6ClNUXFt0vR1i
+  HG+QtV9hBiE8GRODZL0uFwL4Cl2EjDBAIbjtqh2fUy1T6A/u7Y23eVL+cnelk/YT
+  f6uxrTojqd8rUrVvqz0lhaTd1eoT6kd/u2r7YbzLnvraDnBwiuFAPticmw7JuVpZ
+  RpkfFZne43vM6SRQRvmVREEMpk57Mub1ccA9v5eElBuZbfyEO5eMYSc88DkxHCkr
+  sfZbXuL/o5TgPyPL7UYvUyoJ
   -----END CERTIFICATE-----
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
@@ -57,24 +61,24 @@ dependencies:
   name: embiggen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: 
-email: james@r0bertson.co.uk
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -100,8 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
-summary: mtlite
+summary: Martile Lite generates HTML ideally from 1 line of a condensed kind of markdown
+  language.
 test_files: []