firefly 1.4.0 → 1.4.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    firefly (1.3.1)
+    firefly (1.4.0)
       dm-aggregates (~> 1.0.2)
       dm-core (~> 1.0.2)
       dm-migrations (~> 1.0.2)

data/HISTORY

@@ -1,3 +1,8 @@
+= 1.4.1 - 2011-02-11
+
+ * 2011-02-11 Strip leading and trailing whitespace from titles when sharing [ariejan]
+ * 2011-02-11 Make sure shared titles don't exceed a total of 140 characters for twitter [ariejan]
+
 = 1.4.0 - 2011-02-11
 
  * 2011-02-21 Added support for 'share to twitter' links [ariejan]

data/lib/firefly/server.rb

@@ -105,10 +105,11 @@ module Firefly
 
       # Format a tweet
       def tweet(url, message = nil)
-        if message.nil?
+        if message.nil? || message == ""
           config[:tweet].gsub('%short_url%', url)
         else
-          "#{message} #{url}"
+          max_length = 140-1-url.size
+          [message.strip.slice(0...max_length), url].join(' ')
         end
       end
 

data/lib/firefly/version.rb

@@ -1,3 +1,3 @@
 module Firefly
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/firefly/sharing_spec.rb

@@ -60,6 +60,26 @@ describe "Sharing" do
           self.send verb, '/api/share', @params.merge(:target => 'facebook')
         }.should_not change(Firefly::Url, :count)
       end
+
+      it "should shorten long titles to fit within the 140 character limit" do
+        title = "This is a very long title that will never fit in the current one hundred and forty character limit enforce by twitter. Or does it?"
+        self.send verb, '/api/share', @params.merge(:title => title)
+        url = Firefly::Url.first(:url => @params[:url])
+
+        short_url = "http://test.host/#{url.code}"
+        expected  = title.slice(0...(140-1-short_url.length)) + ' ' + short_url
+
+        last_response['Location'].should include(URI.escape(expected))
+      end
+
+      it "should strip the title to remove any unnecessary white space" do
+        title = "      Test post        "
+        self.send verb, '/api/share', @params.merge(:title => title)
+        url = Firefly::Url.first(:url => @params[:url])
+
+        last_response['Location'].should include(URI.escape("Test post http://test.host/#{url.code}"))
+        last_response['Location'].should_not include(URI.escape(title))
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firefly
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Ariejan de Vroom