string_awesome 0.0.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d675469875aea4b7c4d6530e3047ab432fc6ce2
-  data.tar.gz: ecd620e210b9b26361c81d6db69bc20318edd2b2
+  metadata.gz: f24224fff27c945ef52bf8d04e9e4aeb72ac71ce
+  data.tar.gz: 1902cf07e1556874940dc3fda781676e88a25028
 SHA512:
-  metadata.gz: eb4a11e17dad5c39df691c91b6b43c50a385236495df4d2d768b56dc538d4f7b79b4565b9262e69360469e7961ef60b8b5f991051c577b2e90bbe6b07a17fb0c
-  data.tar.gz: 5901dc93bee876e56ef2c15a45f84aee79da423d72df5340480f7798dcda1f812315819e3d6d0e353197ad2bce4d80abdf4d22dfaa96d8070ec59ee9887fbbf0
+  metadata.gz: e9290136f50d03073ca5dd70d0029598d73d6793f4cc1bb9b2f935fc56c533d1268e57f4fcb3764460319dc1e3a2ef892e07f67e1216de80f06af9ceec4e623a
+  data.tar.gz: 68d9835ff3e6ae6111abab19c82e12834f1439236d236579b574b58bd871c67320bce53a7cfa72130788c172f7668502399651000f2f8dda5ce4e703b4508657

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3

data/README.md

@@ -1,12 +1,15 @@
 # StringAwesome
+<a href="https://codeclimate.com/repos/52a6620313d6373dad00a971/feed"><img src="https://codeclimate.com/repos/52a6620313d6373dad00a971/badges/c56ec1b4896feaf32263/gpa.png" /></a>
 
-TODO: Write a gem description
+This gem adds some awesome and easy-to-use extensions to Ruby String class.
 
 ## Installation
 
+Compatible with Ruby 1.9.3+
+
 Add this line to your application's Gemfile:
 
-    gem 'string_awesome'
+    gem 'string_awesome', '~> 0.2.1'
 
 And then execute:
 
@@ -18,7 +21,154 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### HTML
+
+#### String#linkify
+
+Finds URLs in the text and wrap in anchor tag.
+
+``` ruby
+'Awesome site: http://foobar.com'.linkify
+#=> 'Awesome site: <a href="http://foobar.com">http://foobar.com</a>' 
+
+'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>'
+
+'Awesome site: http://foobar.com'.linkify(class: 'link', target: '_blank')
+#=> 'Awesome site: <a href="http://foobar.com" class="link" target="_blank">http://foobar.com</a>'
+
+'Awesome site: http://foobar.com'.linkify(truncate: { length: 10, html_encoded: true })
+#=> 'Awesome site: <a href="http://foobar.com">http://foo&hellip;</a>'
+```
+
+#### String#tweetify
+
+Finds URLs, Twitter handles, hashtags in the text and wrap in anchor tag.
+
+``` ruby
+'What about to follow @tiagopog?'.tweetify
+#=> 'What about to follow <a href="https://twitter.com/tiagopog" target="_blank" class="tt-handle">@tiagopog</a>?'
+
+"Let's code! #rubyrocks".tweetify
+#=> "Let's code! <a href=\"https://twitter.com/search?q=%23rubyrocks\" target=\"_blank\" class=\"hashtag\">#rubyrocks</a>"
+
+'Cool link from @tiagopog! http://foobar.com #rubyrocks'.tweetify(only: [:hashtag])
+#=> 'Cool link from @tiagopog! http://foobar.com <a href="https://twitter.com/search?q=%23rubyrocks" target="_blank" class="hashtag">#rubyrocks</a>'
+
+'Cool link from @tiagopog! http://foobar.com #rubyrocks'.tweetify(only: [:hashtag, :tt_handle])
+#=> 'Cool link from <a href="https://twitter.com/tiagopog" target="_blank" class="tt-handle">@tiagopog</a>! http://foobar.com <a href="https://twitter.com/search?q=%23rubyrocks" target="_blank" class="hashtag">#rubyrocks</a>'
+```
+
+#### String#nl2br
+
+Replaces \n to \<br /\> tags.
+
+``` ruby
+"Hello 
+   world!".nl2br
+#=> "Hello <br/ > world!"
+```
+
+#### String#strip_tags
+
+Removes all HTML tags from text.
+
+``` ruby
+'<h1><a href="http://somecoolurl.com">Aloha!</a></h1>'.strip_tags
+#=> 'Aloha!'
+```
+
+### Other Cool Features
+
+#### String#ellipsis
+
+Appends ellipsis to the text.
+
+``` ruby
+'lorem ipsum!'.ellipsis
+#=> 'lorem...'
+
+"It's a very loooooong text!".ellipsis 11
+#=> "It's a very..."
+
+"It's a very loooooong text!".ellipsis 8, after_a_word: true
+#=> "It's a..."
+
+'lorem ipsum'.ellipsis(5, html_encoded: true)
+#=> 'lorem&hellip;'
+```
+
+#### String#no_accents
+
+Removes accents from words in the text.
+
+``` ruby
+'lórem ipsùm dólor sìt ãmet!'.no_accents
+#=> 'lorem ipsum dolor sit amet!'
+```
+
+#### String#slug
+
+Parses the text to a valid format for URLs.
+
+``` ruby
+'Lórem IPSUM Dolor?'.slug
+#=> 'lorem-ipsum-dolor'
+```
+
+#### String#to_title
+
+Converts the string into a title style and prevents other letters in the middle of the word from being uppercase.
+
+``` ruby
+'loREm IPsuM DOLOR'.to_title
+#=> 'Lorem Ipsum Dolor'
+```
+
+#### String#reverse_words
+
+Reverses a string by words, instead of reversing it by characters like the String#reverse.
+
+``` ruby
+'lorem ipsum dolor'.reverse_words
+#=> 'dolor ipsum lorem'
+```
+
+#### String#count_words
+
+Counts how many words there are in the text.
+
+``` ruby
+'lorem ipsum dolor'.count_words
+#=> 3
+
+'lorem ipsum dolor'.count_words 7 # it will count words until this length: 7
+#=> 1
+```
+
+#### String#first_words
+
+Returns an Array with the N first words from the text.
+
+``` ruby
+'lorem ipsum dolor'.first_words 2
+#=> 'lorem ipsum'
+```
+
+#### String#last_words
+
+Returns am Array with the N last words from the text.
+
+``` ruby
+'lorem ipsum dolor'.last_words 2
+#=> 'ipsum dolor'
+```
 
 ## Contributing
 

data/lib/string_awesome/awesome_methods.rb

@@ -1,11 +1,12 @@
 # coding: utf-8
-
+require 'string_awesome/awesome_regexes'
 require 'active_support/inflector'
 require 'sanitize'
 
 module StringAwesome
   # These methods are all included into the String class.
   module AwesomeMethods
+    include StringAwesome::AwesomeRegexes
     # Replaces \n to <br /> tags.
     # 
     # Example:
@@ -17,8 +18,8 @@ module StringAwesome
       self.gsub /\n/, '<br />'
     end
 
-    # Converts the string to the title style and prevents other 
-    # letters in the middle of the word from being uppercase.
+    # Converts the string into a title style and prevents 
+    # other letters in the middle of the word from being uppercase.
     # 
     # Example:
     #   >> 'loREm IPsuM DOLOR'.to_title
@@ -28,32 +29,27 @@ module StringAwesome
       self.downcase.titleize
     end
 
-    # Removes HTML tags from text.
+    # Removes all HTML tags from text.
     # 
     # Example:
     #   >> '<h1><a href="http://somecoolurl.com">Aloha!</a></h1>'.strip_tags 
     #   => 'Aloha!'
-    #
-    # Arguments:
-    #  allow_whitespace: (Boolean)
-    #    - Let it returns the replaced block HTML tags as whitespaces.
     
-    def strip_tags(allow_whitespace = false)
-      str = Sanitize.clean self
-      allow_whitespace ? str : str.strip
+    def strip_tags
+      Sanitize.clean(self).gsub(/\s+/, ' ').strip
     end
 
-    # Remove accents from words in the text.
+    # Removes accents from words in the text.
     # 
     # Example:
     #   >> 'lórem ipsùm dólor sìt ãmet!'.no_accents
     #   => 'lorem ipsum dolor sit amet!'
     
     def no_accents
-      self.mb_chars.normalize(:kd).gsub(/[^\x00-\x7F]/n, '').to_s
+      self.mb_chars.normalize(:kd).gsub(SA_ACCENT_REGEX, '').to_s
     end
 
-    # Parses text to a valid format for URL's.
+    # Parses the text to a valid format for URLs.
     # 
     # Example:
     #   >> 'Lórem IPSUM Dolor?'.slug
@@ -61,65 +57,31 @@ module StringAwesome
     #
     # Arguments:
     #   downcase: (Boolean)
-    #    - If true, it will force the String to be in downcase.
+    #     - If true, it will force the String to be in downcase.
     
     def slug(downcase = true)
-      str = self.no_accents.gsub(/\W|_/, '-').gsub(/[-]{2,}/, '-').gsub(/^-|-$/, '').to_s
+      str = self.no_accents.words.join '-'
       downcase ? str.downcase : str
     end
 
-    # Append ellipsis to the text.
+    # Returns an array with all the words from the string.
     # 
     # Example:
-    #   >> "It's a very loooooong text!".ellipsis 11
-    #   => "It's a very..."
-    #   >> "It's a very loooooong text!".ellipsis 8, after_a_word: true
-    #   => "It's a..."
-    #
-    # Arguments:
-    #   max_length: (Integer)
-    #    - Indicates the max length expected, before ellipsis, for the result.
-    #   options: (Hash)
-    #    - Other options such as: 
-    #      - :html_encoded - If true, the ellipsis will be displayed in HTML encoded format: &hellip;.
-    #      - :after_a_word   - If true, the ellipsis will be displayed necessarily after a word.
+    #   >> 'Lorem! Ipsum dolor, sit amet 2013.'.words
+    #   => ['Lorem', 'Ipsum', 'dolor', 'sit', 'amet', '2013']
     
-    def ellipsis(max_length = 0, options = {})
-      length = self.length
-      
-      if length > 1 and max_length <= length
-        # Adjusts the max_length
-        max_length  = (length / 2).round if max_length == 0
-        
-        # Truncates the text according to the max_length
-        str = self[0...max_length]
-
-        # Defines how the ellipsis will be displayed
-        ellip = options[:html_encoded] == true ? '&hellip;' : '...'
-
-        # If ellipsis must be applied after a word
-        if options[:after_a_word] == true
-          words = str.split(/\s/)
-          words = words[0..words.length - 2] if words.length > 1
-          str   = words.join(' ')
-        else
-          str = str.gsub(/\s+$/, '')
-        end
-         
-        str + ellip
-      else
-        self
-      end
+    def words
+      self.split(/[\s\W]+/)
     end
 
-    # Reverses a string by words, instead of reversing it by every character (String#reverse).
+    # Reverses a string by words, instead of reversing it by characters.
     # 
     # Example:
     #   >> 'lorem ipsum dolor'.reverse_words
     #   => 'dolor ipsum lorem'
     
     def reverse_words
-      self.split(/\s/).reverse.join(' ')
+      self.words.reverse.join(' ')
     end
 
     # Counts how many words there are in the string limited by the max_length value.
@@ -131,20 +93,18 @@ module StringAwesome
     #   => 1
     # Arguments:
     #   max_length: (Integer)
-    #    - References where it will stop counting words in the string.
+    #     - References where it will stop counting words in the string.
     
     def count_words(max_length = nil)
-      # No duplicated whitespaces
-      str    = self.gsub(/[\s\W]+/, ' ')
       # Counts words
-      count  = (max_length ? str[0...max_length] : str).split(/\s/).count
-      # Checks whether the last word is really a word (must be followed by a whitespace)
-      count -= 1 unless !max_length or (str[max_length - 1] =~ /\s/) or (!(str[max_length - 1] =~ /\W/) and (str[max_length] =~ /\s/))
+      count  = (max_length ? self[0...max_length] : self).words.count
+      # Checks if the last word is complete
+      count -= 1 if max_length and self[max_length - 1, 2] =~ /\w{2}/
       
       count
     end
 
-    # Returns an Array with the N first words of a string.
+    # Returns an Array with the N first words from the text.
     # 
     # Example:
     #   >> 'lorem ipsum'.first_words
@@ -153,14 +113,13 @@ module StringAwesome
     #   => 'lorem ipsum'
     # Arguments:
     #   amount: (Integer)
-    #    - Indicates how many words it expects to ge
+    #     - Indicates how many words it expects to ge
     
     def first_words(amount = nil)
-      words = self.split(/[\s\W]+/)
-      amount ? words[0...amount] : words
+      amount ? self.words[0...amount] : self.words
     end  
 
-    # Returns the N last words of a string.
+    # Returns am Array with the N last words from the text.
     # 
     # Example:
     #   >> 'lorem ipsum'.last_words
@@ -169,14 +128,68 @@ module StringAwesome
     #   => 'ipsum dolor'
     # Arguments:
     #   amount: (Integer)
-    #    - Indicates how many words it expects to ge
+    #     - Indicates how many words it expects to ge
     
     def last_words(amount = nil)
-      words = self.split(/[\s\W]+/).reverse
+      words = self.words.reverse
       (amount ? words[0...amount] : words).reverse
     end
 
-    # Replaces all URL's in the text with HTML link tags
+    # Appends ellipsis to the text.
+    # 
+    # Example:
+    #   >> "It's a very loooooong text!".ellipsis 11
+    #   => "It's a very..."
+    #   >> "It's a very loooooong text!".ellipsis 8, after_a_word: true
+    #   => "It's a..."
+    #
+    # Arguments:
+    #   max_length: (Integer)
+    #     - Indicates the max length expected, before ellipsis, for the result.
+    #   options: (Hash)
+    #     - Other options such as: 
+    #       - :html_encoded - If true, the ellipsis will be displayed in HTML encoded format: &hellip;.
+    #       - :after_a_word   - If true, the ellipsis will be displayed necessarily after a word.
+    
+    def ellipsis(max_length = 0, options = {})
+      length = self.length
+      return self if length <= 1 or length < max_length
+      
+      # Adjusts the max_length
+      max_length = (length / 2).round if max_length == 0      
+      
+      # Truncates the string
+      str = self.truncate(max_length, options[:after_a_word]).strip
+      
+      # Appends ellipsis
+      str << (options[:html_encoded] == true ? '&hellip;' : '...')
+    end
+
+    # Truncates the text.
+    # 
+    # Example:
+    #   >> "It's a very loooooong text!".truncate 11
+    #   => "It's a very"
+    #   >> "It's a very loooooong text!".ellipsis 8, true
+    #   => "It's a"
+    #
+    # Arguments:
+    #   max_length: (Integer)
+    #     - Indicates the max length expected, before ellipsis, for the result.
+    #   after_a_word: (Boolean)
+    #     - If true, the ellipsis will be displayed necessarily after a word.
+    def truncate(length, after_a_word = false)
+      str = self[0...length]      
+      
+      if after_a_word == true
+        words = str.split(/\s+/)
+        str   = words[0..words.length - 2].join(' ')
+      end
+
+      str
+    end
+
+    # Finds URLs in text and wrap in anchor tag.
     # 
     # Example:
     #   >> 'Awesome site: http://foobar.com'.linkify
@@ -186,63 +199,61 @@ module StringAwesome
     # Arguments:
     #   options: (Hash)
     #    - Options for the link tag, such as: 
-    #      - :truncate - If set, it will truncate the URL displayed in the link tag 
+    #      - :truncate - If set, it will truncate the URL displayed in the anchor tag 
     #                    and put an ellipsis according to the given length. It can
     #                    be also a Hash of options:
-    #        - :length - URL's new length.
+    #        - :length - URLs new length.
     #        - :html_encoded - Ellipsis will be displayed as HTML encoded char.
     #      - :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 linkify(options = {})
-      self.gsub!(/\b(((ht|f)tp[s]?:\/\/)?([a-z0-9]+\.)?(?<!@)([a-z0-9\_\-]+)(\.[a-z]+)+([\?\/\:][a-z0-9_=%&@\?\.\/\-\:\#\(\)]+)?\/?)/i) do
-        displayed = match = $1
-
-        # Truncates the URL
-        if options[:truncate]
-          t         = options[:truncate]
-          displayed = t.instance_of?(Hash) ? match.ellipsis(t[:length], html_encoded: t[:html_encoded]) : match.ellipsis(t)
-        end
+      self.gsub!(SA_URL_REGEX) do |match|
+        displayed = _truncate_url match, options[:truncate]
+        
+        options.delete :truncate
 
         # Applies 'class' and 'target' options
-        if !options
-          options = ''
-        else
-          options = options.reduce ' ' do |s, v| 
-            s << (v[0] == :truncate ? '' : "#{v[0]}=\"#{v[1]}\" ")
-          end.gsub(/\s+$/, '')
-        end
+        options = !options ? '' : options.reduce(' ') { |s, v| s << "#{v[0]}=\"#{v[1]}\" " }
 
         # Forces the presence of the 'http://'
-        match = "http://#{match}" unless match =~ /(ht|f)tp[s]?/i
+        match = "http://#{match}" unless match =~ SA_PROTOCOL_REGEX
         
-        "<a href=\"#{match}\"#{options}>#{displayed}</a>"
+        "<a href=\"#{match}\"#{options.gsub(/\s+$/, '')}>#{displayed}</a>"
       end
       self 
     end
 
-    # Matches URL's, Twitter handles and hashtags putting them into HTML link tags.
+    # Trancutes the URL that will be displayed in the <a> tag
+    # 
+    # Arguments:
+    #   m: (String)
+    #     - 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
+    end
+
+    # Finds URLs, Twitter handles, hashtags in the text and wrap in anchor tag.
     # 
     # Example:
-    #   >> 'What about to follow @tiagopog?'
+    #   >> 'What about to follow @tiagopog?'.tweetfy
     #   => 'What about to follow <a href="https://twitter.com/tiagopog" target="_blank" class="tt-handle">@tiagopog</a>?' 
-    #   >> "Let's code! #rubyrocks"
+    #   >> "Let's code! #rubyrocks".tweetfy
     #   => "Let's code! <a href=\"https://twitter.com/search?q=%23rubyrocks\" target=\"_blank\" class=\"hashtag\">#rubyrocks</a>"
     # Arguments:
     #   options: (Hash)
-    #    - Options such as: 
-    #      - :only - Array of Symbols restricting what will be matched on the text.
+    #     - Options such as: 
+    #       - :only - Array of Symbols restricting what will be matched on the text.
     
     def tweetify(options = {})      
       # Applies linkify unless there's some restriction
       only = options[:only]
       str  = only ? self : self.linkify(class: 'link')
 
-      # Stores the regex in a variable just to make it more readable
-      regex = /(((^#)([a-z0-9\_]+))|(([^a-z0-9\W]|\s)((#)([a-z0-9\_]+))))|(((^@)([a-z0-9\_]+))|(([^a-z0-9\W]|\s)((@)([a-z0-9\_]+))))/i
-
       # Iterates with the matched expressions
-      str.gsub!(regex) do |match|
+      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)))
@@ -261,4 +272,4 @@ module StringAwesome
       str
     end
   end 
-end
+end

data/lib/string_awesome/awesome_regexes.rb

@@ -0,0 +1,8 @@
+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_PROTOCOL_REGEX = /(ht|f)tp[s]?/i
+    SA_TWEET_REGEX    = /(((^[@#])|([^a-z0-9\W]|\s)([@|#]))([a-z0-9\_]+))/i
+  end
+end

data/lib/string_awesome/version.rb

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

data/spec/awesome_methods_spec.rb

@@ -32,12 +32,8 @@ describe 'String#strip_tags' do
     '<h1><a href="http://somecoolurl.com">Aloha!</a></h1>'.strip_tags.should eq 'Aloha!'
   end
 
-  it 'should remove by default the whitespaces that were allocated in place of HTML tags' do
-    '<h1>no whitespaces</h1>'.strip_tags.should eq 'no whitespaces'
-  end
-
-  it 'should not remove the whitespaces that were allocated in place of HTML tags, when required' do
-    '<h1>whitespaces</h1>'.strip_tags(true).should eq ' whitespaces '
+  it 'should remove the whitespaces that were allocated in place of HTML tags' do
+    '<h1>lorem ipsum </h1> dolor'.strip_tags.should eq 'lorem ipsum dolor'
   end
 end
 
@@ -63,6 +59,19 @@ describe 'String#slug' do
   end
 end
 
+# 
+# String#truncate
+# 
+describe 'String#truncate' do
+  it 'shoud truncate the text' do
+    "It's a very loooooong text!".truncate(11).should eq "It's a very"
+  end
+
+  it 'shoud truncate the text after a word' do
+    "It's a very loooooong text!".truncate(8, true).should eq "It's a"
+  end
+end
+
 # 
 # String#ellipsis
 # 
@@ -83,7 +92,7 @@ describe 'String#ellipsis' do
     'lorem ipsum'.ellipsis.should eq 'lorem...'
   end
 
-  it "should append the HTML encoded ellipsis in the text" do
+  it 'should append the HTML encoded ellipsis in the text' do
     'lorem ipsum'.ellipsis(5, html_encoded: true).should eq 'lorem&hellip;'
   end
 
@@ -100,6 +109,15 @@ describe 'String#ellipsis' do
   end
 end
 
+# 
+# String#words
+# 
+describe 'String#words' do
+  it 'should return an array with all the words from the string' do
+    'Lorem! Ipsum dolor, sit amet 2013.'.words.should eq ['Lorem', 'Ipsum', 'dolor', 'sit', 'amet', '2013']
+  end
+end
+
 # 
 # String#reverse_words
 # 
@@ -168,37 +186,37 @@ end
 # String#linkify
 # 
 describe 'String#linkify' do
-  it "should replace all the URL's in the text with HTML link tags" do
+  it 'should find all the 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 'can set the "class" HTML attribute to be applied on the link tag' do
+  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>'
     str.linkify(class: 'link').should eq this
   end
 
-  it 'can set the "target" HTML attribute to be applied on the link tag' do
+  it 'can set the "target" HTML attribute to be applied on the anchor tag' do
     str  = 'Awesome site: http://foobar.com'
     this = 'Awesome site: <a href="http://foobar.com" target="_blank">http://foobar.com</a>'
     str.linkify(target: '_blank').should eq this
   end
 
-  it 'can set the class and target HTML attributes to be applied on the link tag' do
+  it 'can set the class and target HTML attributes to be applied on the anchor tag' do
     str  = 'Awesome site: http://foobar.com'
     this = 'Awesome site: <a href="http://foobar.com" class="link" target="_blank">http://foobar.com</a>'
     str.linkify(class: 'link', target: '_blank').should eq this
   end
 
-  it 'can truncate the URL displayed whithin the link tag (Interger param)' do
+  it 'can truncate the URL displayed whithin the anchor tag (Interger param)' do
     str  = 'Awesome site: http://foobar.com'
     this =  'Awesome site: <a href="http://foobar.com">http://foo...</a>'
     str.linkify(truncate: 10).should eq this
   end
 
-  it 'can truncate the URL displayed whithin the link tag (Hash param)' do
+  it 'can truncate the URL displayed whithin the anchor tag (Hash param)' do
     str  = 'Awesome site: http://foobar.com'
     this = 'Awesome site: <a href="http://foobar.com">http://foo&hellip;</a>'
     str.linkify(truncate: { length: 10, html_encoded: true }).should eq this
@@ -210,11 +228,11 @@ describe 'String#linkify' do
     str.linkify(class: 'link', truncate: 10).should eq this
   end
 
-  it "matches URL's without the presence of 'http://' but presenting 'www'" do
+  it "matches URLs without the presence of 'http://' but presenting 'www'" do
     'www.foobar.com'.linkify.should eq '<a href="http://www.foobar.com">www.foobar.com</a>'
   end
 
-  it "matches URL's without the presence of 'http://' and 'www'" do
+  it "matches URLs without the presence of 'http://' and 'www'" do
     'foobar.com'.linkify.should eq '<a href="http://foobar.com">foobar.com</a>'
   end
 end
@@ -223,7 +241,7 @@ end
 # String#tweetify
 # 
 describe 'String#tweetify' do
-  it 'should match Twitter handles (@username) and replace them into HTML link tags' do
+  it 'should find Twitter handles (@username) and wrap them in anchor tags' do
     str  = 'What about to follow @tiagopog?'
     this = 'What about to follow <a href="https://twitter.com/tiagopog" target="_blank" class="tt-handle">@tiagopog</a>?' 
     str.tweetify.should eq this
@@ -234,7 +252,7 @@ describe 'String#tweetify' do
     str.tweetify.should eq str
   end
 
-  it 'should match hashtags (#hashtag) and replace them into HTML link tags' do
+  it 'should find hashtags (#hashtag) and wrap them in anchor tags' do
     str  = "Let's code! #rubyrocks"
     this = "Let's code! <a href=\"https://twitter.com/search?q=%23rubyrocks\" target=\"_blank\" class=\"hashtag\">#rubyrocks</a>"
     str.tweetify.should eq this
@@ -245,31 +263,31 @@ describe 'String#tweetify' do
     str.tweetify.should eq str
   end
 
-  it "should match URL's and replace them into HTML link tags" do
+  it 'should find URLs and wrap them in anchor tags' do
     str  = 'Tweet some cool link: http://foobar.com'
     this = 'Tweet some cool link: <a href="http://foobar.com" class="link">http://foobar.com</a>'
     str.tweetify.should eq this
   end
 
-  it 'should match links, Twitter handles, hashtags and replace them into HTML link tags' do
+  it 'should find links, Twitter handles, hashtags and wrap them in anchor tags' do
     str  = 'Cool link from @tiagopog! http://foobar.com #rubyrocks'
     this = 'Cool link from <a href="https://twitter.com/tiagopog" target="_blank" class="tt-handle">@tiagopog</a>! <a href="http://foobar.com" class="link">http://foobar.com</a> <a href="https://twitter.com/search?q=%23rubyrocks" target="_blank" class="hashtag">#rubyrocks</a>'
     str.tweetify.should eq this
   end
 
-  it 'should match only Twitter handles' do
+  it 'should find only Twitter handles' do
     str  = 'Cool link from @tiagopog! http://foobar.com #rubyrocks'
     this = 'Cool link from <a href="https://twitter.com/tiagopog" target="_blank" class="tt-handle">@tiagopog</a>! http://foobar.com #rubyrocks'
     str.tweetify(only: [:tt_handle]).should eq this
   end
 
-  it 'should match only hashtags' do
+  it 'should find only hashtags' do
     str  = 'Cool link from @tiagopog! http://foobar.com #rubyrocks'
     this = 'Cool link from @tiagopog! http://foobar.com <a href="https://twitter.com/search?q=%23rubyrocks" target="_blank" class="hashtag">#rubyrocks</a>'
     str.tweetify(only: [:hashtag]).should eq this
   end
 
-  it "should not match URL's, just hashtags and Twitter handles" do
+  it 'should not find URLs, just hashtags and Twitter handles' do
     str  = 'Cool link from @tiagopog! http://foobar.com #rubyrocks'
     this = 'Cool link from <a href="https://twitter.com/tiagopog" target="_blank" class="tt-handle">@tiagopog</a>! http://foobar.com <a href="https://twitter.com/search?q=%23rubyrocks" target="_blank" class="hashtag">#rubyrocks</a>'
     str.tweetify(only: [:hashtag, :tt_handle]).should eq this

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: string_awesome
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Tiago Guedes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,12 +108,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/string_awesome.rb
 - lib/string_awesome/awesome_methods.rb
+- lib/string_awesome/awesome_regexes.rb
 - lib/string_awesome/version.rb
 - spec/awesome_methods_spec.rb
 - spec/spec_helper.rb