short 0.4.0 → 0.4.1

data/bin/short

@@ -27,14 +27,23 @@ def start_web
 end
 
 def shorten(url)
-  puts Shortener.shorten(url).short_url
+  begin
+    puts Shortener.shorten(url).short_url
+  rescue Shortener::NetworkException => boom
+    puts boom.message
+    usage
+  end
 end
 
 def fetch(url)
   if url =~ /http:/
     url = url[-6..-1]
   end
-  fetched = Shortener.fetch(url)
+  begin
+    fetched = Shortener.fetch(url)
+  rescue Shortener::NetworkException => boom
+    puts boom.message
+  end
   unless fetched['success'] == false
     puts <<-EOF
   short       => #{fetched['shortened']}
@@ -51,12 +60,20 @@ def fetch(url)
 end
 
 def delete(short)
-  del =  Shortener.delete(short)
+  begin
+    del =  Shortener.delete(short)
+  rescue Shortener::NetworkException => boom
+    puts boom.message
+  end
   puts "#{short} deleted" if del['success']
 end
 
 def show_index
-  index = Shortener.index
+  begin
+    index = Shortener.index
+  rescue Shortener::NetworkException => boom
+    puts boom.message
+  end
   short_summary = index.map do |v|
     url = v['url'].length > 38 ? "#{v['url'][0..25]}...#{v['url'][-10..-1]}" : "#{v['url']}"
     "#{v['shortened']} :   #{url}  #{v['type'].nil? ? '' : ('type: ' + v['type'])}"

data/lib/shortener/server.rb

@@ -67,8 +67,9 @@ class Shortener
 
       def set_or_fetch_url(params)
         bad! 'Missing url.' unless url = params['url']
+        bad! 'Bad URL' unless params['url'] =~ /(^http|^www)/
         url = "http://#{url}" unless /^http/i =~ url
-        bad! 'Malformed url.' unless (url = URI.parse(url)) && /^http/ =~ url.scheme
+        bad! 'Bad URL' unless (url = URI.parse(url)) && /^http/ =~ url.scheme
 
         %w(max-clicks expire desired-short allow-override).each do |k|
           params[k] = false if params[k].nil? || params[k].empty?
@@ -90,7 +91,7 @@ class Shortener
         hash_key = "data:#{sha}:#{key}"
         url = "https://s3.amazonaws.com/#{$conf.s3_bucket}/#{$conf.s3_key_prefix}/#{fname}"
         ext = File.extname(fname)[1..-1]
-        data = {'url' => url, 's3' => true, 'shortened' => key, 
+        data = {'url' => url, 's3' => true, 'shortened' => key,
           'extension' => ext, 'set-count' => 1}
         data = params.merge(data)
 

data/lib/shortener/short.rb

@@ -47,12 +47,14 @@ class Shortener
       # build a request based on configurations
       def request(type, end_point, conf = nil, args = nil)
         config = conf || Shortener::Configuration.current
-        case type
+        response = case type
         when :post
           Net::HTTP.post_form(config.uri_for(end_point), args)
         when :get
           Net::HTTP.get_response(config.uri_for(end_point, args))
         end
+        raise NetworkException.new(response.body) if response.is_a?(Net::HTTPPreconditionFailed)
+        response
       end
 
     end # => ClassMethods

data/lib/shortener/version.rb

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

data/lib/shortener.rb

@@ -9,4 +9,6 @@ require File.join(dir, 'shortener', 'short')
 
 class Shortener
   class << self; include Shortener::Short::ClassMethods; end
+
+  class NetworkException < RuntimeError;end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: short
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70301329586160 !ruby/object:Gem::Requirement
+  requirement: &70230588057420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301329586160
+  version_requirements: *70230588057420
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70301329585240 !ruby/object:Gem::Requirement
+  requirement: &70230592657600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301329585240
+  version_requirements: *70230592657600
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70301329583820 !ruby/object:Gem::Requirement
+  requirement: &70230592656820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301329583820
+  version_requirements: *70230592656820
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70301329582280 !ruby/object:Gem::Requirement
+  requirement: &70230592654100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301329582280
+  version_requirements: *70230592654100
 description: A (hopefully) easy and handy deployable APIable way to shorten links.
 email:
 - jake@jakewilkins.com