string_awesome 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f24224fff27c945ef52bf8d04e9e4aeb72ac71ce
-  data.tar.gz: 1902cf07e1556874940dc3fda781676e88a25028
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDQyMTRjYWQwMzcxOGRmOTVkNWMyYzU2ODI2NmE5MTZhMTFjNDM1Mw==
+  data.tar.gz: !binary |-
+    NzYxYjA3Mjc0YmM1OTdmMWRkOTE2NTg1MzNkN2UxMzE3YWJlNDg1Mg==
 SHA512:
-  metadata.gz: e9290136f50d03073ca5dd70d0029598d73d6793f4cc1bb9b2f935fc56c533d1268e57f4fcb3764460319dc1e3a2ef892e07f67e1216de80f06af9ceec4e623a
-  data.tar.gz: 68d9835ff3e6ae6111abab19c82e12834f1439236d236579b574b58bd871c67320bce53a7cfa72130788c172f7668502399651000f2f8dda5ce4e703b4508657
+  metadata.gz: !binary |-
+    MGZiZjBkOTc2OTdhNjEyYjAxZmNmOGY2MTdiOTQ4YmViN2I4NzUyYjE5ZDQ3
+    MTE5OTZlZDEzYjZjMGYxMDJiMzg2NzBmMzk4YTY1ZDk3YzhjZTczNDg0YTli
+    ZGY3ZWQ2MTE1OWYyYWFjMGM4MTlhNWY2NmJmMDE5NTAzNzQ3YjY=
+  data.tar.gz: !binary |-
+    NmI5MWVhNzk2MjI5NTVjOWU3NjYxM2Y5MmQ2NjRjNmRkMTA0NDlmZGQ4NDMw
+    MWI1NWM3ZWI1ZDY5OWY2ZTRkOGJlY2U5YzY1YTgwMDI3ZmVhYTE4NmUwZTQx
+    NDZhOThlY2U1ODI1NThkYTc0ZjNlYWI3Y2U5MjhlYjhhMmQ4ZmQ=

data/README.md

@@ -1,5 +1,9 @@
-# StringAwesome
-<a href="https://codeclimate.com/repos/52a6620313d6373dad00a971/feed"><img src="https://codeclimate.com/repos/52a6620313d6373dad00a971/badges/c56ec1b4896feaf32263/gpa.png" /></a>
+# String Awesome
+
+[![Build Status](https://travis-ci.org/tiagopog/string_awesome.png?branch=master)](https://travis-ci.org/tiagopog/string_awesome)
+[![Code Climate](https://codeclimate.com/repos/52a5452b7e00a4670f00b139/badges/f9183e7116f7e040c184/gpa.png)](https://codeclimate.com/repos/52a5452b7e00a4670f00b139/feed)
+[![Dependency Status](https://gemnasium.com/tiagopog/string_awesome.png)](https://gemnasium.com/tiagopog/string_awesome)
+[![Gem Version](https://badge.fury.io/rb/string_awesome.png)](http://badge.fury.io/rb/string_awesome)
 
 This gem adds some awesome and easy-to-use extensions to Ruby String class.
 
@@ -9,7 +13,7 @@ Compatible with Ruby 1.9.3+
 
 Add this line to your application's Gemfile:
 
-    gem 'string_awesome', '~> 0.2.1'
+    gem 'string_awesome'
 
 And then execute:
 
@@ -34,9 +38,6 @@ Finds URLs in the text and wrap in anchor tag.
 'www.foobar.com'.linkify
 #=> '<a href="http://www.foobar.com">www.foobar.com</a>'
 
-'foobar.com'.linkify
-#=> '<a href="http://foobar.com">foobar.com</a>'
-
 'Awesome site: http://foobar.com'.linkify(class: 'link', truncate: 10)
 #=> 'Awesome site: <a href="http://foobar.com" class="link">http://foo...</a>'
 

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/lib/string_awesome/awesome_methods.rb

@@ -209,20 +209,31 @@ module StringAwesome
     
     def linkify(options = {})
       self.gsub!(SA_URL_REGEX) do |match|
+        # http://verylongurl...
         displayed = _truncate_url match, options[:truncate]
         
-        options.delete :truncate
-
-        # Applies 'class' and 'target' options
-        options = !options ? '' : options.reduce(' ') { |s, v| s << "#{v[0]}=\"#{v[1]}\" " }
-
+        # Now that we're done with the 'truncate' option, let's remove it...
+        options.delete(:truncate) unless !options
+        
         # Forces the presence of the 'http://'
         match = "http://#{match}" unless match =~ SA_PROTOCOL_REGEX
         
-        "<a href=\"#{match}\"#{options.gsub(/\s+$/, '')}>#{displayed}</a>"
+        "<a href=\"#{match}\"#{_apply_tag_attrs(options)}>#{displayed}</a>"
       end
       self 
     end
+    
+    # Build attributes from Hash for HTML tag
+    #
+    # Arguments:
+    #   options: (Hash)
+    #    - Options for the link tag, such as: 
+    #      - :class - Value for "class" attribute: <a href="url" class="link">url</a>
+    #      - :target - Value for "target" attribute: <a href="url" target="_blank">url</a>
+
+    def _apply_tag_attrs(options)
+      options ? options.reduce(' ') { |s, v| s << "#{v[0]}=\"#{v[1]}\" " }.gsub(/\s+$/, '') : ''
+    end
 
     # Trancutes the URL that will be displayed in the <a> tag
     # 
@@ -231,8 +242,9 @@ module StringAwesome
     #     - Matched URL.
     #   t: (Hash|Integer)
     #     - Where the URL will be truncated.
+    
     def _truncate_url(m, t)
-      t ? (t.instance_of?(Hash) ? m.ellipsis(t[:length], html_encoded: t[:html_encoded]) : m.ellipsis(t)) : m
+      t ? (t.instance_of?(Hash) ? m.ellipsis(t[:length], html_encoded: t[:html_encoded]) : m.ellipsis(t)) : m 
     end
 
     # Finds URLs, Twitter handles, hashtags in the text and wrap in anchor tag.
@@ -245,31 +257,38 @@ module StringAwesome
     # Arguments:
     #   options: (Hash)
     #     - Options such as: 
-    #       - :only - Array of Symbols restricting what will be matched on the text.
+    #       - :only - Array of Symbols restricting what will be matched in the text.
     
     def tweetify(options = {})      
       # Applies linkify unless there's some restriction
-      only = options[:only]
-      str  = only ? self : self.linkify(class: 'link')
+      str = options[:only] ? self : self.linkify(class: 'link')
 
       # Iterates with the matched expressions
       str.gsub!(SA_TWEET_REGEX) do |match|
         is_hashtag = match =~ /#/
         
-        if only and ([:hashtag, :tt_handle] != only.sort) and ((is_hashtag and !only.include?(:hashtag)) or (!is_hashtag and !only.include?(:tt_handle)))
-          match
-        else
-          match      = match.strip
-          tt_url     = 'https://twitter.com/'       
-          tag        = {
-            href:    is_hashtag ? "#{tt_url}search?q=%23#{match.gsub(/#/, '')}" : "#{tt_url}#{match.gsub(/@/, '')}",
-            class:   is_hashtag ? 'hashtag' : 'tt-handle'
-          }
-          
-          " <a href=\"#{tag[:href]}\" target=\"_blank\" class=\"#{tag[:class]}\">#{match}</a>"
+        unless _restricted?(is_hashtag, options[:only])
+          match = match.strip
+          attrs = is_hashtag ? ['hashtag', "search?q=%23#{match.gsub(/#/, '')}"] : ['tt-handle', "#{match.gsub(/@/, '')}"]
+          attrs = { class: attrs[0], href: attrs[1] }
+          match = " <a href=\"https://twitter.com/#{attrs[:href]}\" target=\"_blank\" class=\"#{attrs[:class]}\">#{match}</a>"
         end
+        
+        match
       end      
       str
     end
+
+    # Checks if type (:hashtag or :tt_handle) is allowed to be wrapped in anchor tag.
+    #
+    # Arguments:
+    #   is_hashtag: (Boolean)
+    #     - Does the string contain '#'?
+    #   only: (Array)
+    #     - Types allowed: :hashtag, :tt_handle.
+    
+    def _restricted?(is_hashtag, only)
+      only and ([:hashtag, :tt_handle] != only.sort) and ((is_hashtag and !only.include?(:hashtag)) or (!is_hashtag and !only.include?(:tt_handle))) 
+    end
   end 
 end

data/lib/string_awesome/awesome_regexes.rb

@@ -1,7 +1,7 @@
 module StringAwesome
   module AwesomeRegexes
     SA_ACCENT_REGEX   = /[^\x00-\x7F]/n
-    SA_URL_REGEX      = /\b(((ht|f)tp[s]?:\/\/)?([a-z0-9]+\.)?(?<!@)([a-z0-9\_\-]+)(\.[a-z]+)+([\?\/\:][a-z0-9_=%&@\?\.\/\-\:\#\(\)]+)?\/?)/i
+    SA_URL_REGEX      = /\b((((ht|f)tp[s]?:\/\/)|([a-z0-9]+\.))+(?<!@)([a-z0-9\_\-]+)(\.[a-z]+)+([\?\/\:][a-z0-9_=%&@\?\.\/\-\:\#\(\)]+)?\/?)/i
     SA_PROTOCOL_REGEX = /(ht|f)tp[s]?/i
     SA_TWEET_REGEX    = /(((^[@#])|([^a-z0-9\W]|\s)([@|#]))([a-z0-9\_]+))/i
   end

data/lib/string_awesome/version.rb

@@ -1,3 +1,3 @@
 module StringAwesome
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/awesome_methods_spec.rb

@@ -186,12 +186,45 @@ end
 # String#linkify
 # 
 describe 'String#linkify' do
-  it 'should find all the URLs in text and wrap in anchor tags' do
+  it 'should find all the HTTP URLs in text and wrap in anchor tags' do
     str  = 'Awesome site: http://foobar.com'
     this = 'Awesome site: <a href="http://foobar.com">http://foobar.com</a>'
     str.linkify.should eq this
   end
 
+  it 'should find all the HTTPS URLs in text and wrap in anchor tags' do
+    str  = 'Awesome site: https://foobar.com'
+    this = 'Awesome site: <a href="https://foobar.com">https://foobar.com</a>'
+    str.linkify.should eq this
+  end
+
+  it 'should find all the FTP URLs in text and wrap in anchor tags' do
+    str  = 'Awesome site: ftp://foobar.com'
+    this = 'Awesome site: <a href="ftp://foobar.com">ftp://foobar.com</a>'
+    str.linkify.should eq this
+  end
+
+  it 'should match http://sub.sub.domain' do
+    url  = 'http://www3.blog.foo.bar'
+    str  = "Awesome site: #{url}"
+    this = "Awesome site: <a href=\"#{url}\">#{url}</a>"
+    str.linkify.should eq this
+  end
+
+  it 'should match query strings' do
+    url  = 'http://www.foobar.com/blog?category_id=54322&itle=lorem-ipsum-dolor'
+    str  = "Awesome site: #{url}"
+    this = "Awesome site: <a href=\"#{url}\">#{url}</a>"
+    str.linkify.should eq this
+  end
+
+  it 'should match friendly URLs' do
+    url  = 'http://www.foobar.com/blog/tech/lorem-ipsum-dolor'
+    str  = "Awesome site: #{url}"
+    this = "Awesome site: <a href=\"#{url}\">#{url}</a>"
+    str.linkify.should eq this
+  end
+
   it 'can set the "class" HTML attribute to be applied on the anchor tag' do
     str  = 'Awesome site: http://foobar.com'
     this = 'Awesome site: <a href="http://foobar.com" class="link">http://foobar.com</a>'
@@ -232,8 +265,8 @@ describe 'String#linkify' do
     'www.foobar.com'.linkify.should eq '<a href="http://www.foobar.com">www.foobar.com</a>'
   end
 
-  it "matches URLs without the presence of 'http://' and 'www'" do
-    'foobar.com'.linkify.should eq '<a href="http://foobar.com">foobar.com</a>'
+  it "should not match URLs without the presence of 'http://' and 'www'" do
+    'foobar.com'.linkify.should eq 'foobar.com'
   end
 end
 
@@ -248,8 +281,7 @@ describe 'String#tweetify' do
   end
 
   it 'should not match foo@bar as being a Twitter handle' do
-    str = 'foo@bar'
-    str.tweetify.should eq str
+    'foo@bar'.tweetify.should eq 'foo@bar'
   end
 
   it 'should find hashtags (#hashtag) and wrap them in anchor tags' do
@@ -259,8 +291,7 @@ describe 'String#tweetify' do
   end
 
   it 'should not match foo#bar as being a hashtag' do
-    str = 'foo#bar'
-    str.tweetify.should eq str
+    'foo#bar'.tweetify.should eq 'foo#bar'
   end
 
   it 'should find URLs and wrap them in anchor tags' do

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: string_awesome
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tiago Guedes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
     - - <
@@ -24,7 +24,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
     - - <
@@ -62,14 +62,14 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -90,14 +90,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Awesome and easy-to-use extensions to Ruby String class.
@@ -130,17 +130,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Extensions for Ruby String class