firefly 1.5.0 → 1.5.1

data/.travis.yml

@@ -1,6 +1,5 @@
 script: rake spec
 rvm:
   - 1.8.7
-  - 1.9.2
   - ree
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    firefly (1.4.1)
+    firefly (1.5.0)
       dm-aggregates (~> 1.0.2)
       dm-core (~> 1.0.2)
       dm-migrations (~> 1.0.2)
@@ -9,7 +9,7 @@ PATH
       dm-transactions (~> 1.0.2)
       escape_utils (~> 0.2.3)
       haml (~> 3.0.18)
-      sinatra (~> 1.0)
+      sinatra (~> 1.2.3)
 
 GEM
   remote: http://rubygems.org/
@@ -65,7 +65,15 @@ PLATFORMS
 
 DEPENDENCIES
   database_cleaner (~> 0.6.6)
+  dm-aggregates (~> 1.0.2)
+  dm-core (~> 1.0.2)
+  dm-migrations (~> 1.0.2)
+  dm-mysql-adapter (~> 1.0.2)
   dm-sqlite-adapter (~> 1.0.2)
+  dm-transactions (~> 1.0.2)
+  escape_utils (~> 0.2.3)
   firefly!
+  haml (~> 3.0.18)
   rack-test (~> 0.5.4)
   rspec (~> 2.5.0)
+  sinatra (~> 1.2.3)

data/HISTORY

@@ -1,3 +1,8 @@
+= 1.5.1 - 2011-04-22
+
+ * 2011-04-22 Truncate long URLs in the backend to preserve layout (issue #25) [ariejan]
+ * 2011-04-22 Accept URL encoded titles when sharing to Twitter and Hyves (issue #28) [ariejan]
+
 = 1.5.0 - 2011-04-21
 
  * 2011-04-21 Firefly is now compatible with ruby 1.8.7, 1.9.2 and ree-1.8 [ariejan]

data/firefly.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("sinatra",           ["~> 1.0"])
+  s.add_runtime_dependency("sinatra",           ["~> 1.2.3"])
   s.add_runtime_dependency("dm-core",           ["~> 1.0.2"])
   s.add_runtime_dependency("dm-migrations",     ["~> 1.0.2"])
   s.add_runtime_dependency("dm-transactions",   ["~> 1.0.2"])

data/lib/firefly/base62.rb

@@ -1,9 +1,10 @@
+# encoding: UTF-8
 module Firefly
   class Base62
-  
+
     CHARS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".split('')
     BASE = 62
-  
+
     def self.encode(value)
       s = []
       while value >= BASE
@@ -23,4 +24,4 @@ module Firefly
       total
     end
   end
-end
+end

data/lib/firefly/code_factory.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Firefly
   class CodeFactory
     include DataMapper::Resource

data/lib/firefly/config.rb

@@ -1,6 +1,7 @@
+# encoding: UTF-8
 module Firefly
   class Config < Hash
-    
+
     DEFAULTS = {
       :hostname         => "localhost:3000",
       :api_key          => "test",
@@ -10,12 +11,12 @@ module Firefly
       :hyves_title      => "Check this out",
       :hyves_body       => "Check this out: %short_url%"
     }
-    
+
     def initialize obj
       self.update DEFAULTS
       self.update obj
-    end    
-    
+    end
+
     def set key, val = nil, &blk
       if val.is_a? Hash
         self[key].update val
@@ -24,4 +25,4 @@ module Firefly
       end
     end
   end
-end
+end

data/lib/firefly/server.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'sinatra/base'
 require 'haml'
 require 'digest/md5'
@@ -38,6 +39,18 @@ module Firefly
         session["firefly_session"] = Digest::MD5.hexdigest(key)
       end
 
+      # Taken from Rails
+      def truncate(text, length, options = {})
+        options[:omission] ||= "..."
+
+        length_with_room_for_omission = length - options[:omission].length
+        chars = text
+        stop = options[:separator] ?
+          (chars.rindex(options[:separator], length_with_room_for_omission) || length_with_room_for_omission) : length_with_room_for_omission
+
+        (chars.length > length ? chars[0...stop] + options[:omission] : text).to_s
+      end
+
       def has_valid_api_cookie?
         key = session["firefly_session"]
         key == Digest::MD5.hexdigest(config[:api_key])
@@ -191,11 +204,13 @@ module Firefly
       @code, @result = generate_short_url(@url, nil)
       invalid = @code.nil?
 
+      title = URI.unescape(params[:title])
+
       case (params[:target].downcase.to_sym)
         when :twitter
-          redirect(URI.escape("http://twitter.com/home?status=#{tweet("http://#{config[:hostname]}/#{@code}", params[:title])}"))
+          redirect(URI.escape("http://twitter.com/home?status=#{tweet("http://#{config[:hostname]}/#{@code}", title)}"))
         when :hyves
-          redirect(URI.escape("http://www.hyves.nl/profielbeheer/toevoegen/tips/?#{hyves_post("http://#{config[:hostname]}/#{@code}", params[:title])}"))
+          redirect(URI.escape("http://www.hyves.nl/profielbeheer/toevoegen/tips/?#{hyves_post("http://#{config[:hostname]}/#{@code}", title)}"))
         when :facebook
           redirect(URI.escape("http://www.facebook.com/share.php?u=http://#{config[:hostname]}/#{@code}"))
         end

data/lib/firefly/url.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Firefly
   class Url
     include DataMapper::Resource

data/lib/firefly/version.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Firefly
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/lib/firefly.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'rubygems'
 require 'open-uri'
 require 'cgi'

data/spec/firefly/sharing_facebook_spec.rb

@@ -18,7 +18,7 @@ describe "Sharing" do
   end
 
   [:post, :get].each do |verb|
-    describe "facebook" do
+    describe "facebook via #{verb.to_s.upcase}" do
       it "should create a shortened URL" do
         lambda {
           self.send verb, '/api/share', @params

data/spec/firefly/sharing_hyves_spec.rb

@@ -1,5 +1,4 @@
 # encoding: UTF-8
-# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Sharing" do
@@ -19,7 +18,7 @@ describe "Sharing" do
   end
 
   [:post, :get].each do |verb|
-    describe "hyves" do
+    describe "hyves via #{verb.to_s.upcase}" do
       it "should create a shortened URL" do
         lambda {
           self.send verb, '/api/share', @params
@@ -86,6 +85,14 @@ describe "Sharing" do
         last_response['Location'].should_not include(URI.escape(title))
       end
 
+      it "should strip the title from url encoded entities correctly" do
+        title = "Test%20post"
+        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"))
+        last_response['Location'].should_not include(URI.escape(title))
+      end
 
       it "should escape UTF-8 correctly" do
         title = "Chávez"

data/spec/firefly/sharing_twitter_spec.rb

@@ -18,7 +18,7 @@ describe "Sharing" do
   end
 
   [:post, :get].each do |verb|
-    describe "twitter" do
+    describe "twitter via #{verb.to_s.upcase}" do
       it "should create a shortened URL" do
         lambda {
           self.send verb, '/api/share', @params
@@ -82,6 +82,15 @@ describe "Sharing" do
         last_response['Location'].should_not include(URI.escape(title))
       end
 
+      it "should strip the title from url encoded entities correctly" do
+        title = "Test%20post"
+        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
+
       it "should escape UTF-8 correctly" do
         title = "Chávez"
         self.send verb, '/api/share', @params.merge(:title => title)

data/views/index.haml

@@ -32,7 +32,7 @@
       %tr.highlighted
         %td.value
           %input{ :type => "text", :value => short_url(@highlight), :class => 'short_url', :size => 21 }
-        %td.value.fill <a href="#{@highlight.url}">#{@highlight.url}</a>
+        %td.value.fill <a href="#{@highlight.url}">#{truncate @highlight.url, 130}</a>
         %td.value.center= @highlight.clicks
         %td.value= @highlight.created_at.strftime("%Y-%m-%d %H:%M")
         %td.value
@@ -52,7 +52,7 @@
       %tr{ :class => is_highlighted?(url) ? 'highlighted' : '' }
         %td.value
           %input{ :type => "text", :value => short_url(url), :class => 'short_url', :size => 31 }
-        %td.value.fill <a href="#{url.url}">#{url.url}</a>
+        %td.value.fill <a href="#{url.url}">#{truncate url.url, 130}</a>
         %td.value.center= url.clicks
         %td.value= url.created_at.strftime("%Y-%m-%d %H:%M")
         %td.value

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firefly
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 1
+  prerelease: false
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Ariejan de Vroom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 +02:00
+date: 2011-04-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 25
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        - 2
+        - 3
+        version: 1.2.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -287,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: firefly
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Firefly is your own personal URL shortener for your own domain.