firefly 0.3.1 → 0.4.0

data/HISTORY

@@ -1,3 +1,16 @@
+= HEAD
+
+ * 2010-04-14 - Added button to quickly tweet a URL. Closes #3 [ariejan]
+
+ * 2010-04-14 - Disable autocomplete and spellcheck for the big url input field. Closes #6 [ariejan]
+
+ * 2010-04-14 - After shortening an URL highlight the url that was added in the overview. [ariejan]
+
+ * 2010-04-14 - Made it easy to copy a short url from the overview. Closes #4 [ariejan]
+
+ * 2010-04-13 - Added links to source and issues in footer. [ariejan]
+              - Include domain name in page title. [ariejan]
+
 = 0.3.1 / 2010-04-13
 
  * 2010-04-13 - Fixed issue with setting `created_at` timestamp. [ariejan]

data/README.md

@@ -14,7 +14,11 @@ After you have installed the Firefly gem you should create a `config.ru` file th
     disable :run
     
     app = Firefly::Server.new do
+      # The domain you use for shortening.
       set :hostname,    "localhost:3000"
+      # set :hostname,    "aj.gs"
+      
+      # Used for authenticating you.
       set :api_key,     "test"
       
       # Use Sqlite3 by default
@@ -24,6 +28,16 @@ After you have installed the Firefly gem you should create a `config.ru` file th
       # Make sure to install the do_mysql gem:
       #    sudo gem install do_mysql
       # set :database,    "mysql://root@localhost/firefly"
+      
+      # Set the number of recent urls to show in the overview.
+      # Defaults to 25
+      # set :recent_urls, 10
+      
+      # Set the tweet template.
+      # The tag %short_url% will be replaced with the actual url.
+      #
+      # Default: Check this out: %short_url%
+      # set :tweet,       "I loved this: %short_url% - Go check it out now!"
     end
     
     run app
@@ -41,8 +55,10 @@ All configuration is done in `config.ru`.
  * `:hostname` sets the hostname to use for shortened URLs. 
  * `:api_key` sets the API key. This key is required when posting new URLs
  * `:database` a database URI that [DataMapper][1] can understand.
+ * `:recent_urls` sets the number of URLs to show in the overview. Default: 25.
+ * `:tweet` set the template to use for tweets. Default: `"Check this out: %short_url%"`
 
-It's possible to use all kinds of backends with DataMapper. Sqlite3 and MySQL have been tested, but others like MongoDB may work as well. 
+It's possible to use all kinds of backends with DataMapper. Sqlite3 and MySQL have been tested, but others may work as well. 
 
 [1]: http://datamapper.org/
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/firefly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{firefly}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ariejan de Vroom"]
-  s.date = %q{2010-04-13}
+  s.date = %q{2010-04-14}
   s.description = %q{FireFly is a simple URL shortner for personal use. It's powered by Sinatra and can be run with any Rack-capable web server.}
   s.email = %q{ariejan@ariejan.net}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/firefly/url.rb",
      "lib/firefly/version.rb",
      "public/favicon.ico",
+     "public/images/twitter.png",
      "public/jquery-1.4.2.min.js",
      "public/reset.css",
      "public/style.css",

data/lib/firefly/config.rb

@@ -5,7 +5,8 @@ module Firefly
       :hostname    => "localhost:3000",
       :api_key     => "test",
       :database    => "sqlite3://#{Dir.pwd}/firefly_#{ENV['RACK_ENV']}.sqlite3",
-      :recent_urls => 25
+      :recent_urls => 25,
+      :tweet       => "Check this out: %short_url%"
     }
     
     def initialize obj

data/lib/firefly/server.rb

@@ -59,14 +59,27 @@ module Firefly
         
         return code, result
       end
+      
+      def is_highlighted?(url)
+        return false unless @highlight
+        @highlight == url.code
+      end
+      
+      # Format a tweet
+      def tweet(url)
+        config[:tweet].gsub('%short_url%', url)
+      end
     end
     
     before do
       @authenticated = has_valid_api_cookie?
       @config        = config
+      @highlight     = nil
+      @title         = "Firefly — #{@config[:hostname]}"
     end
     
     get '/' do
+      @highlight ||= params[:highlight]
       @urls = Firefly::Url.all(:limit => config[:recent_urls], :order => [ :created_at.desc ])
       haml :index
     end
@@ -93,7 +106,7 @@ module Firefly
       @result ||= "Invalid URL specified."
       
       if params[:visual]
-        redirect "/api/info/#{@code}"
+        redirect "/?highlight=#{@code}"
       else
         @result
       end

data/public/style.css

@@ -81,4 +81,11 @@ body { padding:0; margin:0; }
 #main .sidebox { float: right; width: 320px; }
 
 #main .the_form { margin-bottom: 30px; }
-#main table tr td.label { font-weight: bold; }
+
+#main table tr td.value { white-space: nowrap; }
+#main table tr.highlighted td.value { background-color: #ccffcc; }
+#main table tr td.value.fill { width: 100%; white-space: normal; }
+#main table tr td.value.center { text-align: center; }
+#main table tr td.label { font-weight: bold; }
+#main table tr td input.short_url { border: 1px solid #CCC; color: #666; font-family: Monaco, 'Courier New', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', monospace; font-size: 11px; height: 16px; padding: 3px 5px 2px; width: 160px; }
+#main table tr td img.twitter { border: 0; margin: 0; padding: 0; float: right; width: 16px; height: 16px; }

data/views/index.haml

@@ -14,7 +14,7 @@
     %form{ :action => '/api/add', :method => 'post' }
       %input{ :type => "hidden", :name => "visual", :value => "1" }
       %p
-        %input.big_url{ :type => 'text', :name => 'url', :id => 'url', :size => 50 }
+        %input.big_url{ :type => 'text', :name => 'url', :id => 'url', :size => 50, :autocomplete => "off", :spellcheck => 'false' }
       %p
         %input.big_url{ :type => 'submit', :name => 'submit', :id => 'submit', :value => "Make it short!" }
       
@@ -26,14 +26,24 @@
       %td.label Full URL
       %td.label Clicks
       %td.label Shortened at
+      %td.label  
     - @urls.each do |url|
-      %tr
-        %td.value #{short_url(url)}
-        %td.value <a href="#{url.url}">#{url.url}</a>
-        %td.value= url.clicks
+      %tr{ :class => is_highlighted?(url) ? 'highlighted' : '' }
+        %td.value
+          %input{ :type => "text", :value => short_url(url), :class => 'short_url', :size => 21 }
+        %td.value.fill <a href="#{url.url}">#{url.url}</a>
+        %td.value.center= url.clicks
         %td.value= url.created_at.strftime("%Y-%m-%d %H:%M")
-  
-  
+        %td.value
+          %a{ :href => "http://twitter.com/home?status=#{tweet(short_url(url))}" }
+            %img.twitter{ :src => "/images/twitter.png", :width => "16", :height => "16" }
+          
+  :javascript
+    $(document).ready(function() {
+      $('input.short_url').each(function(index) {
+        $(this).mouseup(function() { $(this).select(); });
+      });  
+    });
 - else
   %h1 Please enter your API key
   

data/views/info.haml

@@ -6,14 +6,21 @@
 %table
   %tr
     %td.label Short URL
-    %td.value #{@short_url}
-  %tr
     %td.label Full URL
-    %td.value <a href="#{@url.url}">#{@url.url}</a>
-  %tr
     %td.label Clicks
-    %td.value= @url.clicks
-  %tr
     %td.label Shortened at
+  
+  %tr
+    %td.value
+      %input{ :type => "text", :value => short_url(@url), :class => 'short_url', :size => 21 }
+    %td.value.fill <a href="#{@url.url}">#{@url.url}</a>
+    %td.value.center= @url.clicks
     %td.value= @url.created_at.strftime("%Y-%m-%d %H:%M")
+
+:javascript
+  $(document).ready(function() {
+    $('input.short_url').each(function(index) {
+      $(this).mouseup(function() { $(this).select(); });
+    });  
+  });
   

data/views/layout.haml

@@ -1,7 +1,7 @@
 !!!
 %html
   %head
-    %title Firefly
+    %title #{@title}
     %meta(charset="UTF-8")
     %link{ :rel => "stylesheet", :href => u('reset.css') }
     %link{ :rel => "stylesheet", :href => u('style.css') }
@@ -10,11 +10,11 @@
     .header
       %ul.nav
         %li.current
-          %a{ :href => '/' } Firefly
+          %a{ :href => '/' } #{@title}
           
     #main
       = yield
     
     #footer
       %p
-        Powered by <a href="http://github.com/ariejan/firefly">Firefly</a> v#{Firefly::Version}
+        Powered by <a href="http://github.com/ariejan/firefly">Firefly</a> v#{Firefly::Version} | <a href="http://github.com/ariejan/firefly/tree/v#{Firefly::Version}">Source</a> | <a href="http://github.com/ariejan/firefly/issues">Issues</a>

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ariejan de Vroom
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 +02:00
+date: 2010-04-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,6 +141,7 @@ files:
 - lib/firefly/url.rb
 - lib/firefly/version.rb
 - public/favicon.ico
+- public/images/twitter.png
 - public/jquery-1.4.2.min.js
 - public/reset.css
 - public/style.css