flakey 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60aacac058c0a16e290380a51173862b00e9f696
-  data.tar.gz: a335d65b83b8b5c74ee53592611826896300b258
+  metadata.gz: 0e8ed80023a112ce6933d258fd187acd36cc4934
+  data.tar.gz: fefaa9d180d0634a6ea3af541fb10241f408e456
 SHA512:
-  metadata.gz: 887d44fce9a2af4482d8064c67b7b279ac049cbd7a2396db5ed05cfba4b207f162e185c309f5da7adab6a576dbd36f8037f0d15e46162467dc5912541a2f5664
-  data.tar.gz: e251bcbdafddd823a5e2f2d1f90f40cc1366c41e460b993ba39b950acb3bc18cafaf30ee98d8a0962c2cb26842489bd28e80efac96bf9d5c1970bf678f8f91b7
+  metadata.gz: cb887103c4e8051540b4e86def11f364e3b7d620ad38810332f2cd94613b4a625396f3696d935d280ed02d1a6ef86880e1f89bcf6bcd437c0c34f5e2c60168ee
+  data.tar.gz: 0e76af570f101688569d7c14ec9a82acdf3b8b987201d59d2eca5f43e43e0b9718ebaaeddf9d0145205a6400a97ddd2d044e031c4cdec82145856a98b13beb43

data/lib/flakey/twitter.rb

@@ -136,28 +136,40 @@ module Flakey
       link_to text, intent_url, options.except(:user_id, :screen_name)
     end
 
-    def custom_tweet_button(options = {}, &block)
+    def tweet_url(options = {})
       defaults = {
-        label: 'Tweet',
-        url: request.url,
+        url: respond_to?(:request) && request.url, # allow inclusion in classes that don't respond to :request, or where request is nil
         related: Flakey.configuration.tweet_related,
         hashtags: Flakey.configuration.tweet_hashtags,
-        via: Flakey.configuration.tweet_via,
-        class: 'custom-tweet-button',
-        target: '_blank'
+        via: Flakey.configuration.tweet_via
       }
       settings = defaults.merge(options)
       url = "#{SHARE_URL}?url=#{CGI.escape settings[:url]}"
 
-      label = settings[:label]
-      # Delete these so we can pass the settings directly into link_to
-      settings.delete(:label)
-      settings.delete(:url)
-
       %w[text hashtags related via].each do |url_key|
         if settings.has_key?(url_key.to_sym) && settings[url_key.to_sym] != ''
           url += "&#{url_key}=#{CGI.escape settings[url_key.to_sym]}"
         end
+      end
+      
+      url
+    end
+
+    def custom_tweet_button(options = {}, &block)
+
+      url = tweet_url(options)
+
+      defaults = {
+        label: 'Tweet',
+        class: 'custom-tweet-button',
+        target: '_blank'
+      }
+      settings = defaults.merge(options)
+
+      label = settings.delete(:label)
+
+      # Delete these so we can pass the settings directly into link_to
+      %w[url text hashtags related via].each do |url_key|
         settings.delete(url_key.to_sym)
       end
 

data/lib/flakey/version.rb

@@ -1,3 +1,3 @@
 module Flakey
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/flakey/twitter_spec.rb

@@ -56,6 +56,31 @@ describe Flakey::Twitter do
     end
   end
 
+  describe "#tweet_url" 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"
+    end
+
+    it "should include via" do
+      subject.tweet_url(:via => "kieran").should =~ /[&?]via=kieran/
+    end
+    
+    it "should include hashtags" do
+      subject.tweet_url(:hashtags => "cupoftea").should =~ /[&?]hashtags=cupoftea/
+    end
+    
+    it "should include text" do
+      subject.tweet_url(:text => "hello").should =~ /[&?]text=hello/
+    end
+    
+    it "should include related" do
+      subject.tweet_url(:related => "someone").should =~ /[&?]related=someone/
+    end
+    
+  end
+
   describe 'custom_tweet_button' do
     before { subject.stub_chain('request.url') { 'http://example.com/hello' } }
     let(:default_url) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flakey
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - David Tuite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport