guillotine 1.0.1 → 1.0.2

data/guillotine.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'guillotine'
-  s.version           = '1.0.1'
-  s.date              = '2011-09-29'
+  s.version           = '1.0.2'
+  s.date              = '2011-10-11'
   s.rubyforge_project = 'guillotine'
 
   ## Make sure your summary is short. The description may be as long

data/lib/guillotine.rb

@@ -1,8 +1,9 @@
 require 'base64'
 require 'digest/md5'
+require 'addressable/uri'
 
 module Guillotine
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 
   dir = File.expand_path '../guillotine', __FILE__
   autoload :App, "#{dir}/app"
@@ -42,6 +43,17 @@ module Guillotine
       def shorten(url)
         Base64.urlsafe_encode64([Digest::MD5.hexdigest(url).to_i(16)].pack("N")).sub(/==\n?$/, '')
       end
+
+      # Parses and sanitizes a URL.
+      #
+      # url - A String URL.
+      #
+      # Returns an Addressable::URI.
+      def parse_url(url)
+        url.gsub! /\s/, ''
+        url.downcase!
+        Addressable::URI.parse url
+      end
     end
   end
 end

data/lib/guillotine/adapters/memory_adapter.rb

@@ -2,6 +2,7 @@ module Guillotine
   module Adapters
     # Stores shortened URLs in memory.  Totally scales.
     class MemoryAdapter < Adapter
+      attr_reader :hash, :urls
       def initialize
         @hash = {}
         @urls = {}

data/lib/guillotine/app.rb

@@ -1,5 +1,4 @@
 require 'sinatra/base'
-require 'addressable/uri'
 
 module Guillotine
   class App < Sinatra::Base
@@ -8,15 +7,14 @@ module Guillotine
     get "/:code" do
       code = params[:code]
       if url = settings.db.find(code)
-        redirect url
+        redirect settings.db.parse_url(url).to_s
       else
         halt 404, "No url found for #{code}"
       end
     end
 
     post "/" do
-      url  = Addressable::URI.parse params[:url]
-      code = params[:code]
+      url  = settings.db.parse_url params[:url].to_s
 
       if !(url && url.scheme =~ /^https?$/)
         halt 422, "Invalid url: #{url}"
@@ -34,7 +32,7 @@ module Guillotine
       end
 
       begin
-        if code = settings.db.add(url.to_s.strip, code)
+        if code = settings.db.add(url.to_s, params[:code])
           redirect code, 201
         else
           halt 422, "Unable to shorten #{url}"

data/test/app_test.rb

@@ -22,7 +22,7 @@ class AppTest < Guillotine::TestCase
     url  = 'http://github.com'
     code = ADAPTER.add url
 
-    post '/', :url => url
+    post '/', :url => url.upcase
     assert code_url = last_response.headers['Location']
     assert_equal code, code_url.gsub(/.*\//, '')
   end
@@ -38,6 +38,15 @@ class AppTest < Guillotine::TestCase
     assert_equal url, last_response.headers['Location']
   end
 
+  def test_redirects_to_split_url
+    url = "http://abc.com\nhttp//def.com"
+    ADAPTER.hash['split'] = url
+    ADAPTER.urls[url]     = 'split'
+
+    get '/split'
+    assert_equal "http://abc.comhttp//def.com", last_response.headers['location']
+  end
+
   def test_clashing_urls_raises_error
     code = ADAPTER.add 'http://github.com/123'
     post '/', :url => 'http://github.com/456', :code => code
@@ -54,6 +63,13 @@ class AppTest < Guillotine::TestCase
     assert_equal 'http://example.org/SWtBvQ', last_response.headers['location']
   end
 
+  def test_adds_split_url
+    post '/', :url => "https://abc.com\nhttp://abc.com"
+    assert_equal 'http://example.org/cb5CNA', last_response.headers['location']
+
+    assert_equal 'https://abc.comhttp//abc.com', ADAPTER.find('cb5CNA')
+  end
+
   def test_rejects_non_http_urls
     post '/', :url => 'ftp://abc.com'
     assert_equal 422, last_response.status

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guillotine
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000Z
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70118940049540 !ruby/object:Gem::Requirement
+  requirement: &70100650093440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70118940049540
+  version_requirements: *70100650093440
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70118940049020 !ruby/object:Gem::Requirement
+  requirement: &70100650092860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70118940049020
+  version_requirements: *70100650092860
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70118940048460 !ruby/object:Gem::Requirement
+  requirement: &70100650092080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118940048460
+  version_requirements: *70100650092080
 description: Adaptable private URL shortener
 email: technoweenie@gmail.com
 executables: []