firefly 0.4.2 → 0.4.3

data/HISTORY

@@ -1,3 +1,7 @@
+= 0.4.3 / 2010-06-06 
+
+ * 2010-06-06 - Handle invalid API keys correctly.
+
 = 0.4.2 / 2010-06-06 
 
  * 2010-06-06 - Added a fix for MySQL users to update the `code` column to use the correct collation. Fixes #9 [ariejan]
@@ -5,11 +9,8 @@
 = 0.4.1 / 2010-04-30
 
  * 2010-04-30 - Normalize URLs before shortening them. This prevents false duplicates. [ariejan]
-
  * 2010-04-30 - Validate URLs to be valid HTTP or HTTPS, don't accept others. [ariejan]
- 
  * 2010-04-30 - Don't ask for the API key after shortening a URL with the bookmarklet. [ariejan]
- 
  * 2010-04-15 - Show the highlighted URL separately. Closes #7. [ariejan]
 
 = 0.4.0.1 / 2010-04-14
@@ -19,13 +20,9 @@
 = 0.4.0 / 2010-04-14
 
  * 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]
 
@@ -38,19 +35,14 @@
  * 2010-04-13 - Added recent urls to dashboard [ariejan]
               - Added bookmarklet [ariejan]
               - Split up Firefly codebase for better testing and maintainability [ariejan]
-
  * 2010-04-02 - Added Ruby 1.9.x compatibility. [ariejan]
 
 = 0.2.0 / 2010-03-29 
   
  * 2010-03-29 - Added some GUI sugar at '/'. [ariejan]
- 
  * 2010-03-29 - Added /api/info/:code for basic stats on the specified URL. [ariejan]
-
  * 2010-03-29 - Keep count of the number of visits to a given URL. [ariejan]
-
  * 2010-03-29 - Fill in `created_at` for Firefly::Url. [ariejan]
- 
  * 2010-03-29 - Changed Firefly::Url String properties to a length of 255 instead of the default of 50. [ariejan]
 
 = 0.1 / 2010-03-28

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/firefly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{firefly}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ariejan de Vroom"]

data/lib/firefly/server.rb

@@ -40,7 +40,9 @@ module Firefly
       def validate_api_permission
         if !has_valid_api_cookie? && params[:api_key] != config[:api_key]
           status 401
-          return "Permission denied: Invalid API key." 
+          return false 
+				else
+					return true
         end
       end
       
@@ -106,7 +108,8 @@ module Firefly
     #
     # Returns the shortened URL
     api_add = lambda {
-      validate_api_permission
+      validate_api_permission or return "Permission denied: Invalid API key"
+
       @url           = params[:url]
       @code, @result = generate_short_url(@url)
       @result ||= "Invalid URL specified."
@@ -127,8 +130,8 @@ module Firefly
     #
     # Show info on the URL
     get '/api/info/:code' do
-      validate_api_permission
-      
+      validate_api_permission or return "Permission denied: Invalid API key"
+
       @url = Firefly::Url.first(:code => params[:code])
       
       if @url.nil?

data/spec/firefly/api_spec.rb

@@ -62,6 +62,11 @@ describe "API" do
         last_response.status.should eql(401)
       end
 
+			it "should not return a shortened URL on 401" do
+        self.send verb, '/api/add', :url => 'http://example.org', :api_key => 'false'
+				last_response.body.should match(/Permission denied: Invalid API key/)
+			end
+
       it "should create a new Firefly::Url" do
         lambda {
           self.send verb, '/api/add', :url => 'http://example.org', :api_key => 'test'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firefly
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Ariejan de Vroom