short 0.3.1 → 0.3.2

data/bin/short

@@ -35,14 +35,18 @@ def fetch(url)
     url = url[-6..-1]
   end
   fetched = Shortener::Client.new.fetch(url)
-  puts <<-EOF
+  unless fetched['success'] == false
+    puts <<-EOF
   short       => #{fetched['shortened']}
   url         => #{fetched['url']}
   set-count   => #{fetched['set-count']}
   click-count => #{fetched['click-count']}
   expired     => #{fetched['expired']}
   maxed       => #{fetched['maxed']}
-EOF
+    EOF
+  else
+    puts fetched['message']
+  end
 end
 
 def delete(short)

data/lib/shortener/server.rb

@@ -280,21 +280,29 @@ class Shortener
     end
 
     #get '/:id.?:format?' do
-    get %r{\/([a-z0-9]{5})(\.[a-z]{3,}){0,1}}i do
+    get %r{\/([a-z0-9]{3,})(\.[a-z]{3,}){0,1}}i do
       id = params[:captures].first
       sha = $redis.get(id)
-      unless sha.nil?
+      if sha.nil?
+        if (params[:captures].last == '.json')
+          content_type :json
+          {success: false, message: 'Short not found'}.to_json
+        else
+          puts "redirecting to default url"
+          redirect $default_url
+        end
+      else
         key = "data:#{sha}:#{id}"
         short = $redis.hgetall(key)
         not_expired = short.has_key?('expire') ? $redis.get(short['expire']) : true
         not_maxed = !(short['click-count'].to_i >= short['max-clicks'].to_i)
         short.has_key?('max-clicks') ? not_maxed : not_maxed = true
-        $redis.hincrby(key, 'click-count', 1) if not_expired && not_maxed
         if params[:captures].last == '.json'
           ret = short.merge({expired: not_expired.nil? , maxed: !not_maxed})
           content_type :json
           return ret.to_json
         else
+          $redis.hincrby(key, 'click-count', 1) if not_expired && not_maxed
           if not_expired
             unless short['s3'] == 'true' && !(short['type'] == 'download')
               if not_maxed
@@ -309,8 +317,6 @@ class Shortener
           end # => expired check
         end # => format
       end
-      puts "redirecting to default url"
-      redirect $default_url
     end
 
     post '/upload.?:format?' do |format|

data/lib/shortener/version.rb

@@ -1,6 +1,6 @@
 
 class Shortener
 
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: short
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-23 00:00:00.000000000 Z
+date: 2011-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70366416744540 !ruby/object:Gem::Requirement
+  requirement: &70253057029640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70366416744540
+  version_requirements: *70253057029640
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70366416743560 !ruby/object:Gem::Requirement
+  requirement: &70253057028820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70366416743560
+  version_requirements: *70253057028820
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70366416741440 !ruby/object:Gem::Requirement
+  requirement: &70253057027960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70366416741440
+  version_requirements: *70253057027960
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70366416737040 !ruby/object:Gem::Requirement
+  requirement: &70253057023180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70366416737040
+  version_requirements: *70253057023180
 description: A (hopefully) easy and handy deployable APIable way to shorten links.
 email:
 - jake@jakewilkins.com