martile 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e83c96109f8a7f0a93f81b7a4a2ee46d84381a
-  data.tar.gz: 90f341c9122107c1ff62a7ee5f1252fd9e4c9198
+  metadata.gz: 25c1a77f9c0c0d5419e4805f9299947951ae86c1
+  data.tar.gz: 91b58bfec74a3256056ce4a2d6e61c231cc7eff0
 SHA512:
-  metadata.gz: fbb07740e1c811c81909029ee8e9d2e1a25f2d7c0d473b402f02900f686ea74b599902773d839c8fb4ff2be3f9e21ff44e839b3c9ac658cf3e62e40eed7470ce
-  data.tar.gz: e57f5b817fa1bab4b920c8c468a04c37aa647e4fd867204423cd181b88f0b462227c15e9585be9f83fd434bb7b74b98b79196b3b6329a36934dee5f55bf37e4a
+  metadata.gz: 80695f432b5176645488935b9f8dbfd016a7317213dba0877eca9c49fda8ad3e9535e725edcd469b067b725c140c6f96d87b73570d603781d4067507def37c39
+  data.tar.gz: 264e49fa70ffc012ad466bce24d1576423fd64a3de80428d023925856adc2560514047bcc012dc86f31732a324d7ecc38677242c631f3ec75417057814d966dd

data/lib/martile.rb

@@ -8,6 +8,7 @@ require 'dynarex'
 require 'rdiscount'
 
 
+# bug fix:  07-Oct-2014: Smartlink tested for new cases
 # feature:  27-Sep-2014: 1. A smartlink can now be used 
 #                                               e.g. ?link http://someurl?
 #                        2. pre tegs can now be created from 2 pairs of slash 
@@ -245,14 +246,17 @@ class Martile
   end
   
   def smartlink(s)
-    s.gsub(/\B\?([^\n]+) +(https?:\/\/[^\b]+)\?\B/,'[\1](\2)')
-  end
+    
+    s.gsub(/\B\?([^\n]+) +(https?:\/\/.*\?)(?=\B)/) do
+      "[%s](%s)" % [$1, ($2).chop]
+    end
+
+  end  
   
   def slashpre(s
                )
     s.gsub(/\B\/\/([^\/]+)\B\/\//) do |x|
-      "<pre>#{($1)..gsub('&','&amp;').gsub('<','&lt;').gsub('>','&gt;')\
-                                   .lines.map{|y| y.sub(/^ +/,'')}.join}</pre>"
+      "<pre>#{($1).lines.map{|y| y.sub(/^ +/,'')}.join}</pre>"
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - James Robertson