firefly 1.2.0 → 1.2.2

data/HISTORY

@@ -1,3 +1,12 @@
+= 1.2.1/1.2.2 / 2011-01-26
+
+ * 2011-01-26 - Added GUI support for custom short codes. [ariejan]
+
+= 1.2.0 / 2011-01-26
+
+ * 2010-12-30 - Support for specifying one's own preferred short codes via the API. Also, invalid URL creations return a 422 code, not 200. 
+ * 2010-12-30 - Make Barby optional to save some gems for those of us who don't need QR code generation. [mboeh]
+
 = 1.1.0 / 2010-10-02
 
  * 2010-10-02 - Generate a QR Code image when accessing http://:host/:code.png

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.2

data/firefly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{firefly}
-  s.version = "1.2.0"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ariejan de Vroom"]
-  s.date = %q{2011-01-26}
+  s.date = %q{2011-01-28}
   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 = [

data/lib/firefly/url.rb

@@ -18,6 +18,8 @@ module Firefly
     
     # Shorten a long_url and return a new FireFly::Url
     def self.shorten(long_url, code = nil)
+      code = nil if code !~ /\S/
+
       return nil unless valid_url?(long_url)
       return nil unless valid_code?(code)
 

data/spec/firefly/api_spec.rb

@@ -21,6 +21,14 @@ describe "API" do
         last_response.body.should eql("http://test.host/#{url.code}")
       end
 
+      it "should generate a short code if `short` is blank" do
+        self.send verb, '/api/add', :url => "http://example.org", :short => "", :api_key => 'test'
+        url = Firefly::Url.first(:url => "http://example.org/")
+
+        last_response.should be_ok
+        last_response.body.should eql("http://test.host/#{url.code}")
+      end
+
       it "should permit including a requested short code" do
         self.send verb, '/api/add', :url => "http://example.org", :short => 'orz', :api_key => 'test'
         

data/views/index.haml

@@ -14,7 +14,9 @@
     %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, :autocomplete => "off", :spellcheck => 'false' }
+        %input.big_url{ :type => 'text', :placeholder => "Paste your long URL here...", :name => 'url', :id => 'url', :size => 40, :autocomplete => "off", :spellcheck => 'false' }
+        %span{ :style => "font-size: 1.8em;" }= '>' 
+        %input.big_url{ :type => 'text', :placeholder => "Optional short code", :name => 'short', :id => 'short', :size => 20, :autocomplete => "off", :spellcheck => 'false' }
       %p
         %input.big_url{ :type => 'submit', :name => 'submit', :id => 'submit', :value => "Make it short!" }
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firefly
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Ariejan de Vroom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +01:00
+date: 2011-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency