short 0.4.1 → 0.4.2

data/bin/short

@@ -43,6 +43,7 @@ def fetch(url)
     fetched = Shortener.fetch(url)
   rescue Shortener::NetworkException => boom
     puts boom.message
+    exit
   end
   unless fetched['success'] == false
     puts <<-EOF
@@ -64,6 +65,7 @@ def delete(short)
     del =  Shortener.delete(short)
   rescue Shortener::NetworkException => boom
     puts boom.message
+    exit
   end
   puts "#{short} deleted" if del['success']
 end

data/lib/shortener/server.rb

@@ -30,8 +30,8 @@ class Shortener
         halt 412, {}, message
       end
 
-      def nope!
-        halt 404, {}, "No luck."
+      def nope!(message = 'No luck.')
+        halt 404, {}, message
       end
 
       def base_url
@@ -169,10 +169,15 @@ class Shortener
       def delete_short(id)
         puts "deleting #{id}"
         puts sha = $redis.get(id)
-        $redis.multi do
-          $redis.del "data:#{sha}:#{id}"
-          $redis.del "expire:#{sha}:#{id}"
-          $redis.del id
+        unless sha.nil?
+          $redis.multi do
+            $redis.del "data:#{sha}:#{id}"
+            $redis.del "expire:#{sha}:#{id}"
+            $redis.del id
+          end
+          true
+        else
+          false
         end
       end
 
@@ -230,10 +235,11 @@ class Shortener
     end
 
     get '/delete/:id.:format' do |id, format|
-      delete_short(id)
+      status = delete_short(id)
       if format == 'json'
+        nope! "Short not found: #{id}" if status == false
         content_type :json
-        {success: true, shortened: id}.to_json
+        {success: status, shortened: id}.to_json
       else
         redirect :index
       end
@@ -262,8 +268,7 @@ class Shortener
       sha = $redis.get(id)
       if sha.nil?
         if (params[:captures].last == '.json')
-          content_type :json
-          return {success: false, message: 'Short not found'}.to_json
+          nope! "Short not found: #{id}"
         else
           puts "redirecting to default url"
           redirect $conf.default_url

data/lib/shortener/short.rb

@@ -53,7 +53,7 @@ class Shortener
         when :get
           Net::HTTP.get_response(config.uri_for(end_point, args))
         end
-        raise NetworkException.new(response.body) if response.is_a?(Net::HTTPPreconditionFailed)
+        raise NetworkException.new(response.body) if response.kind_of?(Net::HTTPClientError)
         response
       end
 

data/lib/shortener/version.rb

@@ -1,6 +1,6 @@
 
 class Shortener
 
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: short
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000 Z
+date: 2012-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70230588057420 !ruby/object:Gem::Requirement
+  requirement: &70223898504320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230588057420
+  version_requirements: *70223898504320
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70230592657600 !ruby/object:Gem::Requirement
+  requirement: &70223898503760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230592657600
+  version_requirements: *70223898503760
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70230592656820 !ruby/object:Gem::Requirement
+  requirement: &70223898502800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230592656820
+  version_requirements: *70223898502800
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70230592654100 !ruby/object:Gem::Requirement
+  requirement: &70223898500040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230592654100
+  version_requirements: *70223898500040
 description: A (hopefully) easy and handy deployable APIable way to shorten links.
 email:
 - jake@jakewilkins.com