string_awesome 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDQyMTRjYWQwMzcxOGRmOTVkNWMyYzU2ODI2NmE5MTZhMTFjNDM1Mw==
-  data.tar.gz: !binary |-
-    NzYxYjA3Mjc0YmM1OTdmMWRkOTE2NTg1MzNkN2UxMzE3YWJlNDg1Mg==
+SHA1:
+  metadata.gz: 0e7a2d49fdaa2999e14bbd47104154df9831f39f
+  data.tar.gz: 77f20be63fb8cde1a961ccd6678b0961f6a507f8
 SHA512:
-  metadata.gz: !binary |-
-    MGZiZjBkOTc2OTdhNjEyYjAxZmNmOGY2MTdiOTQ4YmViN2I4NzUyYjE5ZDQ3
-    MTE5OTZlZDEzYjZjMGYxMDJiMzg2NzBmMzk4YTY1ZDk3YzhjZTczNDg0YTli
-    ZGY3ZWQ2MTE1OWYyYWFjMGM4MTlhNWY2NmJmMDE5NTAzNzQ3YjY=
-  data.tar.gz: !binary |-
-    NmI5MWVhNzk2MjI5NTVjOWU3NjYxM2Y5MmQ2NjRjNmRkMTA0NDlmZGQ4NDMw
-    MWI1NWM3ZWI1ZDY5OWY2ZTRkOGJlY2U5YzY1YTgwMDI3ZmVhYTE4NmUwZTQx
-    NDZhOThlY2U1ODI1NThkYTc0ZjNlYWI3Y2U5MjhlYjhhMmQ4ZmQ=
+  metadata.gz: 1dec6e517d7750c18e9a95b955393a7f03d83743a939c06d1dec88d4f2a43824f1fed7e5f194d37ec804c6d93f69bd516ea0d3f723e272780fc845dde44e8f1a
+  data.tar.gz: c43e8eae6e433c0df800c0a62ddd214a1ba976eebc2e46316978fbbba90081df0a20842c061f78d7dfbf6c390c6db7c55ba11dad84a9f21010004dbdf96c28dd

data/lib/string_awesome/awesome_methods.rb

@@ -257,11 +257,14 @@ module StringAwesome
     # Arguments:
     #   options: (Hash)
     #     - Options such as: 
-    #       - :only - Array of Symbols restricting what will be matched in the text.
+    #       - :only      - Array of Symbols restricting what will be matched in the text;
+    #       - :url       - Attributes for URLs <a> links;
+    #       - :tt_handle - Attributes for Twitter handles <a> links;
+    #       - :hashtag   - Attributes for hashtag <a> links.
     
     def tweetify(options = {})      
       # Applies linkify unless there's some restriction
-      str = options[:only] ? self : self.linkify(class: 'link')
+      str = options[:only] ? self : self.linkify(options[:url] || {})
 
       # Iterates with the matched expressions
       str.gsub!(SA_TWEET_REGEX) do |match|
@@ -269,9 +272,8 @@ module StringAwesome
         
         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>"
+          attrs = is_hashtag ? ["search?q=%23#{match.gsub(/#/, '')}", :hashtag] : ["#{match.gsub(/@/, '')}", :tt_handle]
+          match = " <a href=\"https://twitter.com/#{attrs[0]}\"#{_apply_tag_attrs(options[attrs[1]])}>#{match}</a>"
         end
         
         match

data/lib/string_awesome/version.rb

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

data/spec/awesome_methods_spec.rb

@@ -276,51 +276,75 @@ end
 describe 'String#tweetify' 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>?' 
+    this = 'What about to follow <a href="https://twitter.com/tiagopog">@tiagopog</a>?' 
     str.tweetify.should eq this
   end
 
+  it 'should find Twitter handles (@username) and wrap them in anchor tags (attributes included)' 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(tt_handle: { target: '_blank', class: 'tt-handle' }).should eq this
+  end
+
   it 'should not match foo@bar as being a Twitter handle' do
     'foo@bar'.tweetify.should eq 'foo@bar'
   end
 
   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>"
+    this = "Let's code! <a href=\"https://twitter.com/search?q=%23rubyrocks\">#rubyrocks</a>"
     str.tweetify.should eq this
   end
 
+  it 'should find hashtags (#hashtag) and wrap them in anchor tags (attributes included)' 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(hashtag: { target: '_blank', class: 'hashtag' }).should eq this
+  end
+
   it 'should not match foo#bar as being a hashtag' do
     'foo#bar'.tweetify.should eq 'foo#bar'
   end
 
   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>'
+    this = 'Tweet some cool link: <a href="http://foobar.com">http://foobar.com</a>'
     str.tweetify.should eq this
   end
 
+  it 'should find URLs and wrap them in anchor tags (attributes included)' 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(url: { class: 'link' }).should eq this
+  end
+
   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>'
+    this = 'Cool link from <a href="https://twitter.com/tiagopog">@tiagopog</a>! <a href="http://foobar.com">http://foobar.com</a> <a href="https://twitter.com/search?q=%23rubyrocks">#rubyrocks</a>'
     str.tweetify.should eq this
   end
 
   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'
+    this = 'Cool link from <a href="https://twitter.com/tiagopog">@tiagopog</a>! http://foobar.com #rubyrocks'
     str.tweetify(only: [:tt_handle]).should eq this
   end
 
   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>'
+    this = 'Cool link from @tiagopog! http://foobar.com <a href="https://twitter.com/search?q=%23rubyrocks">#rubyrocks</a>'
     str.tweetify(only: [:hashtag]).should eq this
   end
 
   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>'
+    this = 'Cool link from <a href="https://twitter.com/tiagopog">@tiagopog</a>! http://foobar.com <a href="https://twitter.com/search?q=%23rubyrocks">#rubyrocks</a>'
     str.tweetify(only: [:hashtag, :tt_handle]).should eq this
   end
+
+  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], tt_handle: { target: '_blank', class: 'tt-handle' }, hashtag: { target: '_blank', class: 'hashtag' }).should eq this
+  end
 end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: string_awesome
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tiago Guedes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-20 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.11
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Extensions for Ruby String class