auto-linker 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d0705bcdf4bd6e6004012b4cf7456b6dc6390e
-  data.tar.gz: c7ab11f3b86f6c3ee06fe7341e3752bdb88dcefc
+  metadata.gz: b588273f3f7ca4a2d62d4b7d914102c1c335c61d
+  data.tar.gz: 1c31d044c745d7efde62a2433dfe07f85017b13a
 SHA512:
-  metadata.gz: 5d7d860e3e8d7dea5cd0473797b0346f88ee84e4e24eea1d3b5a9c7d18d316f4f5f4d16e043b7b6f40621e1cdad1b2408bc68aae8c31b1b49d54713e6c96b7c8
-  data.tar.gz: be5c45b7e84b19a9bea0f9f08f0cfa3764daa086b6267718d3166670d77168d266b6ce02e34eeacfcf1200ca2b2bc5afb15e7d4c99f567bd191330cd763c48df
+  metadata.gz: 6c2fd0e2364201f31e5b7c1dbd983fc425c3844bb561cb21a8da92c0300a45722fddedc5b1bc2220cd3eda34e89bde8d8cba2c4d7913c307c6375fe8cb303af6
+  data.tar.gz: 0a97f0366e81906c1e51b239050ad8cd37f4d43f37d2dc257dcc9163949e97571ad03115559b34b813f8f926e32f911f5254fb2cbc4ac90024ec10cfb07563b1

data/lib/auto-linker.rb

@@ -1,3 +1,5 @@
+require "rinku"
+
 %w(
   config/instagram
   config/twitter

data/lib/auto-linker/config/instagram.rb

@@ -2,13 +2,13 @@ class Autolinker
   module Config
     INSTAGRAM = {
       :handle_class => "linked-url handle".freeze,
-      :hashtag_class  => "linked-url hashtag".freeze,
-      :url_class  => "linked-url url".freeze,
-      :email_class  => "linked-url email".freeze,
-
       :handle_url_base => "https://instagram.com/".freeze,
+
+      :hashtag_class  => "linked-url hashtag".freeze,
       :hashtag_url_base  => "https://instagram.com/explore/tags/".freeze,
 
+      :url_class  => "linked-url url".freeze,
+
       :target => "_blank".freeze
     }.freeze
   end

data/lib/auto-linker/config/twitter.rb

@@ -2,13 +2,13 @@ class Autolinker
   module Config
     TWITTER = {
       :handle_class => "linked-url handle".freeze,
-      :hashtag_class  => "linked-url hashtag".freeze,
-      :url_class  => "linked-url url".freeze,
-      :email_class  => "linked-url email".freeze,
-
       :handle_url_base => "https://twitter.com/".freeze,
+
+      :hashtag_class  => "linked-url hashtag".freeze,
       :hashtag_url_base  => "https://twitter.com/#!/search?q=%23".freeze,
 
+      :url_class  => "linked-url url".freeze,
+
       :target => "_blank".freeze
     }.freeze
   end

data/lib/auto-linker/linker.rb

@@ -25,9 +25,8 @@ class Autolinker
     return '' unless text
     
     @text = text
-    replace_url
+    @text = Rinku.auto_link(@text, mode=:all, "class=\"#{@config[:url_class]}\" target=\"#{@config[:target]}\"")
     replace_handle
-    replace_email
     replace_hashtag
     @text
   end
@@ -35,21 +34,11 @@ class Autolinker
   private
     # Replaces handles with clickable links
     def replace_handle
-      @text.gsub!(Regex::HANDLE, '<a href="' << @config[:handle_url_base] << '\1" class="' << @config[:handle_class] <<  '" target="' << @config[:target] << '">@\1</a>')
-    end
-
-    # Replaces urls with clickable links
-    def replace_url
-      @text.gsub!(Regex::URL, '<a href="http://\1" class="' << @config[:url_class] << '" target="' << @config[:target] << '">\1</a>')
-    end
-
-    # Replaces emails with clickable links
-    def replace_email
-      @text.gsub!(Regex::EMAIL, '<a href="mailto:\1" class="' << @config[:email_class] << '" target="' << @config[:target] << '">\1</a>')
+      @text.gsub!(Regex::HANDLE, "<a href=\"#{@config[:handle_url_base]}\\1\" class=\"#{@config[:handle_class]}\" target=\"#{@config[:target]}\">@\\1</a>")
     end
 
     # Replaces hashtags with clickable links
     def replace_hashtag
-      @text.gsub!(Regex::HASHTAG, '<a href="' << @config[:hashtag_url_base] << '\1" class="' << @config[:hashtag_class] << '" target="' << @config[:target] << '">#\1</a>')
+      @text.gsub!(Regex::HASHTAG, "<a href=\"#{@config[:hashtag_url_base]}\\1\" class=\"#{@config[:hashtag_class]}\" target=\"#{@config[:target]}\">#\\1</a>")
     end
 end

data/lib/auto-linker/regex.rb

@@ -1,11 +1,7 @@
 class Autolinker
   module Regex extend self
-    HANDLE = /(?:\s|^)(?:@)(\w+)/i
+    HANDLE = /\B@([\w]+)/i
 
-    HASHTAG = /(?:\s|^)(?:#(?!\d+(?:\s|$)))(\w+)(?=\s|$)/i
-
-    URL = /(?:https?:\/\/)?([\da-z\.-]+\.[a-z\.]{2,6}[\/\w \#\.-]*)+\/?/i
-
-    EMAIL = /([a-z0-9_\.-]+@[\da-z\.-]+\.[a-z\.]{2,6})/i
+    HASHTAG = /\B#([\w]+)/i
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: auto-linker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - François Lehoux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
-dependencies: []
+date: 2015-09-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rinku
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 description: Automatically replace mentions, hashtags, urls and emails with links
   for multiple services (twitter, instagram, facebook, ...)
 email: