flakey 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdaa0852e52677cbc342060527c5c57ce03249e9
-  data.tar.gz: a8482a3dbddbf9b9895963b37f2106fbed04f31b
+  metadata.gz: 28b795800a5dcd3ea393bf982545c1ff566b0bef
+  data.tar.gz: 78a7668a64523e437a8445b017e763569b2bc17a
 SHA512:
-  metadata.gz: 703a7508b1567ce45c8de3e9a64cf5a9d373f7b28094357ce9c190f762b8dc12cf94273dfe73cb97e6cb0da4a37c34012c14eca77d5e55ce97f8d0a058acd115
-  data.tar.gz: bed81739f31e57756eb30c40a8f0cbee21d895d954e18a98e1f0f1e770014ce3f724e46f9b1c391ad2db5e76cd02792c3f42b65bee3a4423a423aea894d12480
+  metadata.gz: fd0e001c015608adb4b797eb5c773893606e8690a4d02d6e438fe1ad8bee816593ed2cc1b8b4ed160012501ec423d5317d4c1e9b9e880ad8594af965025661a2
+  data.tar.gz: 3c0f43d85704467a9ebd0fbf7590c92606c3657287a78fb5e536aef35beb468e62ba9ac178821a15519159652fc352bacfc87189160e210655fe1f95b197d9f4

data/lib/flakey/twitter.rb

@@ -8,7 +8,7 @@ module Flakey
     include Base
 
     BASE_URL = "https://twitter.com"
-    SHARE_URL = BASE_URL + "/share"
+    SHARE_URL = BASE_URL + "/intent/tweet"
 
     # Default HTML classes for the various buttons.
     TWEET_BUTTON_CLASS = 'twitter-share-button'
@@ -117,10 +117,11 @@ module Flakey
 
     # Generate a link which will open a dialog for following the user with
     # whe specified user_id or screen_name.
-    def follow_intent_link(text, options = {})
+    def follow_intent_link(options = {}, &block)
       user_id_to_follow = options[:user_id] || Flakey.configuration.twitter_user_id
       screen_name_to_follow = options[:screen_name] || 
         Flakey.configuration.twitter_handle
+      label = options.has_key?(:label) ? options.delete(:label) : "Follow Me"
 
       intent_url = 'https://twitter.com/intent/user?'
 
@@ -134,7 +135,11 @@ module Flakey
         intent_url += "screen_name=#{screen_name_to_follow}"
       end
 
-      link_to text, intent_url, options.except(:user_id, :screen_name)
+      if block_given?
+        link_to(intent_url, options.except(:user_id, :screen_name), &block)
+      else
+        link_to label, intent_url, options.except(:user_id, :screen_name)
+      end
     end
 
     def tweet_url(options = {})
@@ -145,7 +150,7 @@ module Flakey
         via: Flakey.configuration.tweet_via
       }
       settings = defaults.merge(options)
-      url = "https://twitter.com/intent/tweet?url=#{CGI.escape settings[:url]}"
+      url = "#{SHARE_URL}?url=#{CGI.escape settings[:url]}"
 
       %w[text hashtags related via].each do |url_key|
         if settings.has_key?(url_key.to_sym) && settings[url_key.to_sym] != ''

data/lib/flakey/version.rb

@@ -1,3 +1,3 @@
 module Flakey
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/flakey/twitter_spec.rb

@@ -60,7 +60,8 @@ describe Flakey::Twitter do
     before { subject.stub_chain('request.url') { 'http://www.example.com' } }
 
     it "should include the url" do
-      subject.tweet_url().should == "https://twitter.com/share?url=http%3A%2F%2Fwww.example.com"
+      expected = "https://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.example.com"
+      subject.tweet_url.should == expected
     end
 
     it "should include via" do
@@ -78,7 +79,6 @@ describe Flakey::Twitter do
     it "should include related" do
       subject.tweet_url(:related => "someone").should =~ /[&?]related=someone/
     end
-    
   end
 
   describe 'custom_tweet_button' do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: flakey
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - David Tuite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   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
   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
   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: Social helpers for Rails apps.
@@ -73,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -108,17 +108,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.2.2
 signing_key: 
 specification_version: 4
 summary: Makes a bunch of helper methods available for including in your Rails views.