autolinks 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51d03f82d7621ef0b4475994d54dbe4aee9ac871
-  data.tar.gz: 3c781e34ecde513af3635fcc7352674d97b12e3a
+  metadata.gz: ae1d97cb0f6671822be54cbc3f17f14808a0af8a
+  data.tar.gz: 3f635eb68a5e1088bad0a2d47829dcd2d1e62bb8
 SHA512:
-  metadata.gz: d0e7b056e40c2e3771b2e1b7bebcf485f8e825580d6375e286351d34c90ecb7ff69a89b04474f138eda167896cdf706cf063457ef135b9039b2162bc7f389541
-  data.tar.gz: 59d6ec4ac3c12511d695e1e9bd06e20c2e745e5f8cc910370404d5dd57749f12e3d16ac1089b6ccf9314bd761a527ac1477d94bd49327f58b99363f95c3082a3
+  metadata.gz: 52dac825cb2f8ab0c5a4f7adad95f6cbd890d88f598b69dcca52dac5178bb3400ec777fd9287cef39c4e024aca1aa5e9a8c914205569b3eb0448a77ed2d0c373
+  data.tar.gz: 7eb7b40ec1b161af2098f088e82d7b6bb1a7a6909a81df9b8c1eb9dd5300d397d43fbfefdd5eae9d06b6715c9f8733bdf40894f502aca7b22bb1282da2998854

data/lib/autolinks/regex.rb

@@ -9,11 +9,11 @@ module Autolinks
     end
 
     def self.http
-      /(https?:\/\/[\S]+\.[a-z\/\.]+)/i
+      /(https?:\/\/[\S]+\.[!#$&-;=?-[\]_a-z~]|%[\w\d]{2}]+[\w])/i
     end
 
     def self.http_address
-      /https?:\/\/([\S]+\.[a-z\/\.]+)/i
+      /https?:\/\/([\S]+\.[!#$&-;=?-[\]_a-z~]|%[\w\d]{2}]+[\w])/i
     end
 
     def self.hashtag
@@ -28,4 +28,4 @@ module Autolinks
       /(\b[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}\b)/i
     end
   end
-end
+end

data/lib/autolinks/version.rb

@@ -1,3 +1,3 @@
 module Autolinks
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/regex_spec.rb

@@ -21,15 +21,27 @@ describe Autolinks::Regex do
     end
   end
 
-  describe "http" do
+  describe "http", focus: true do
     it "should match the complete urls in the Test String" do
-      Autolinks::TEST_STRING.scan(Autolinks::Regex.http).flatten.should == ["http://google.com", "http://google.com/", "http://google.co.uk"]
+      Autolinks::TEST_STRING.scan(Autolinks::Regex.http).flatten.should == ["http://google.com", "http://google.com", "http://google.co.uk"]
+    end
+
+    Autolinks::TEST_URLS.each do |link|
+      it "should match #{link}" do
+        link.scan(Autolinks::Regex.http).flatten.should == [link.gsub(/\W$/, '')]
+      end
     end
   end
 
-  describe "http_address" do
+  describe "http_address", focus: true do
     it "should match the complete urls in the Test String" do
-      Autolinks::TEST_STRING.scan(Autolinks::Regex.http_address).flatten.should == ["google.com", "google.com/", "google.co.uk"]
+      Autolinks::TEST_STRING.scan(Autolinks::Regex.http_address).flatten.should == ["google.com", "google.com", "google.co.uk"]
+    end
+
+    Autolinks::TEST_URLS.each do |link|
+      it "should match #{link}" do
+        link.scan(Autolinks::Regex.http_address).flatten.should == [link.gsub(/https?:\/\//, '').gsub(/\W$/, '')]
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -23,4 +23,15 @@ module Autolinks
   This is a test string with some #hashtags and other types of #marked #content....
   winning! We're #1! email@email.com. We're also going to test some URL's: http://google.com,
   or http://google.com/, or google.com, or http://google.co.uk, or google.co.uk"
+
+  TEST_URLS = [
+    "http://foo.com/blah_blah",
+    "http://foo.com/blah_blah/",
+    "http://www.extinguishedscholar.com/wpglob/?p=364.",
+    "http://6303E4C1-6A6E-45A6-AB9D-3A908F59AE0E.org",
+    "http://www.quillandquire.com/blog/index.php/bookselling-2/2012/11/12/qa-the-monkeys-paw-introduces-the-biblio-mat-book-vending-machine/",
+    "http://google.co.uk",
+    "http://foo.com/blah_(wikipedia)_blah#cite-1",
+    "http://mw1.google.com/mw-earth-vectordb/kml-samples/gp/seattle/gigapxl/$[level]/r$[y]_c$[x].jpg"
+  ]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autolinks
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jay Sanders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec