guillotine 1.0.8 → 1.1.0

data/Gemfile

@@ -1,12 +1,22 @@
 source 'http://rubygems.org'
 
-gem 'sinatra'
-gem 'addressable'
+gemspec
+
+gem 'rake'
 
 group :test do
   gem 'rack-test'
 end
 
+if ENV['TRAVIS']
+  gem 'sequel'
+  gem 'sqlite3'
+  gem 'redis'
+  gem 'mongo'
+  gem 'bson_ext'
+  gem 'riak-client'
+end
+
 # Bundler isn't designed to provide optional functionality like this.  You're
 # on your own
 #

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.8'
-  s.date              = '2011-11-11'
+  s.version           = '1.1.0'
+  s.date              = '2011-11-26'
   s.rubyforge_project = 'guillotine'
 
   ## Make sure your summary is short. The description may be as long
@@ -56,15 +56,22 @@ Gem::Specification.new do |s|
     lib/guillotine.rb
     lib/guillotine/adapters/active_record_adapter.rb
     lib/guillotine/adapters/memory_adapter.rb
+    lib/guillotine/adapters/mongo_adapter.rb
+    lib/guillotine/adapters/redis_adapter.rb
     lib/guillotine/adapters/riak_adapter.rb
     lib/guillotine/adapters/sequel_adapter.rb
     lib/guillotine/app.rb
+    lib/guillotine/service.rb
+    script/cibuild
     test/active_record_adapter_test.rb
     test/app_test.rb
     test/helper.rb
     test/memory_adapter_test.rb
+    test/mongo_adapter_test.rb
+    test/redis_adapter_test.rb
     test/riak_adapter_test.rb
     test/sequel_adapter_test.rb
+    test/service_test.rb
   ]
   # = MANIFEST =
 

data/lib/guillotine/adapters/active_record_adapter.rb

@@ -23,7 +23,7 @@ module Guillotine
           code ||= shorten url
           begin
             Url.create :url => url, :code => code
-          rescue ActiveRecord::RecordNotUnique
+          rescue ActiveRecord::RecordNotUnique, ActiveRecord::StatementInvalid
             row = Url.select(:url).where(:code => code).first
             existing_url = row && row[:url]
             raise DuplicateCodeError.new(existing_url, url, code)
@@ -38,9 +38,7 @@ module Guillotine
       #
       # Returns the String URL.
       def find(code)
-        if row = Url.select(:url).where(:code => code).first
-          row[:url]
-        end
+        select :url, :code => code
       end
 
       # Public: Retrieves the code for a given URL.
@@ -49,9 +47,7 @@ module Guillotine
       #
       # Returns the String code, or nil if none is found.
       def code_for(url)
-        if row = Url.select(:code).where(:url => url).first
-          row[:code]
-        end
+        select :code, :url => url
       end
 
       # Public: Removes the assigned short code for a URL.
@@ -60,7 +56,7 @@ module Guillotine
       #
       # Returns nothing.
       def clear(url)
-        Url.where(:url => url).delete
+        Url.where(:url => url).delete_all
       end
 
       def setup
@@ -73,6 +69,12 @@ module Guillotine
         conn.add_index :urls, :url, :unique => true
         conn.add_index :urls, :code, :unique => true
       end
+
+      def select(field, query)
+        if row = Url.select(field).where(query).first
+          row[field]
+        end
+      end
     end
   end
 end

data/lib/guillotine/adapters/mongo_adapter.rb

@@ -0,0 +1,70 @@
+require 'mongo'
+
+module Guillotine
+  module Adapters
+    class MongoAdapter < Adapter
+      def initialize(collection)
+        @collection = collection
+        @collection.ensure_index([['url',  Mongo::ASCENDING]])
+
+        # \m/
+        @transformers = {
+          :url => lambda { |doc| doc['url'] },
+          :code => lambda { |doc| doc['_id'] }
+        }
+      end
+      
+      # Public: Stores the shortened version of a URL.
+      # 
+      # url  - The String URL to shorten and store.
+      # code - Optional String code for the URL.
+      #
+      # Returns the unique String code for the URL.  If the URL is added
+      # multiple times, this should return the same code.
+      def add(url, code = nil)
+        code_for(url) || insert(url, code || shorten(url))
+      end
+
+      
+      # Public: Retrieves a URL from the code.
+      #
+      # code - The String code to lookup the URL.
+      #
+      # Returns the String URL, or nil if none is found.
+      def find(code)
+        select :url, :_id => code
+      end
+
+      # Public: Retrieves the code for a given URL.
+      #
+      # url - The String URL to lookup.
+      #
+      # Returns the String code, or nil if none is found.
+      def code_for(url)
+        select :code, :url => url
+      end
+
+      # Public: Removes the assigned short code for a URL.
+      #
+      # url - The String URL to remove.
+      #
+      # Returns nothing.
+      def clear(url)
+        @collection.remove(:url => url)
+      end
+
+      def select(field, query)
+        @collection.find_one(query, {:transformer => @transformers[field]})
+      end
+      
+    private
+      def insert(url, code)
+        if existing_url = find(code)
+          raise DuplicateCodeError.new(existing_url, url, code) if url != existing_url
+        end
+        @collection.insert(:_id => code, :url => url)
+        code
+      end
+    end
+  end
+end

data/lib/guillotine/adapters/redis_adapter.rb

@@ -0,0 +1,63 @@
+module Guillotine
+  module Adapters
+    class RedisAdapter < Adapter
+      # Public: Initialise the adapter with a Redis instance.
+      #
+      # redis - A Redis instance to persist urls and codes to.
+      def initialize(redis)
+        @redis = redis
+      end
+
+      # Public: Stores the shortened version of a URL.
+      # 
+      # url  - The String URL to shorten and store.
+      # code - Optional String code for the URL.
+      #
+      # Returns the unique String code for the URL.  If the URL is added
+      # multiple times, this should return the same code.
+      def add(url, code = nil)
+        if existing_code = @redis.get("guillotine:urls:#{url}")
+          existing_code
+        else
+          code ||= shorten(url)
+          if existing_url = @redis.get("guillotine:hash:#{code}")
+            raise DuplicateCodeError.new(existing_url, url, code) if url != existing_url
+          end
+          @redis.set "guillotine:hash:#{code}", url
+          @redis.set "guillotine:urls:#{url}", code
+          code
+        end
+      end
+
+      # Public: Retrieves a URL from the code.
+      #
+      # code - The String code to lookup the URL.
+      #
+      # Returns the String URL, or nil if none is found.
+      def find(code)
+        @redis.get "guillotine:hash:#{code}"
+      end
+
+      # Public: Retrieves the code for a given URL.
+      #
+      # url - The String URL to lookup.
+      #
+      # Returns the String code, or nil if none is found.
+      def code_for(url)
+        @redis.get "guillotine:urls:#{url}"
+      end
+
+      # Public: Removes the assigned short code for a URL.
+      #
+      # url - The String URL to remove.
+      #
+      # Returns nothing.
+      def clear(url)
+        if code = @redis.get("guillotine:urls:#{url}")
+          @redis.del "guillotine:urls:#{url}"
+          @redis.del "guillotine:hash:#{code}"
+        end
+      end
+    end
+  end
+end

data/lib/guillotine/adapters/sequel_adapter.rb

@@ -37,9 +37,7 @@ module Guillotine
       #
       # Returns the String URL.
       def find(code)
-        if row = @table.select(:url).where(:code => code).first
-          row[:url]
-        end
+        select :url, :code => code
       end
 
       # Public: Retrieves the code for a given URL.
@@ -48,9 +46,7 @@ module Guillotine
       #
       # Returns the String code, or nil if none is found.
       def code_for(url)
-        if row = @table.select(:code).where(:url => url).first
-          row[:code]
-        end
+        select :code, :url => url
       end
 
       # Public: Removes the assigned short code for a URL.
@@ -64,13 +60,19 @@ module Guillotine
 
       def setup
         @db.create_table :urls do
-          string :url
-          string :code
+          String :url
+          String :code
 
           unique :url
           unique :code
         end
       end
+
+      def select(field, query)
+        if row = @table.select(field).where(query).first
+          row[field]
+        end
+      end
     end
   end
 end

data/lib/guillotine/app.rb

@@ -1,53 +1,35 @@
 require 'sinatra/base'
 
 module Guillotine
+  # Essentially herds Sinatra input to Guillotine::Service, and ensures the
+  # output is fit Sinatra to return.
   class App < Sinatra::Base
-    set :required_host, nil
+    set :service, nil
 
     get "/:code" do
-      code = params[:code]
-      if url = settings.db.find(Addressable::URI.escape(code))
-        redirect settings.db.parse_url(url).to_s
-      else
-        halt 404, simple_escape("No url found for #{code}")
-      end
+      escaped = Addressable::URI.escape(params[:code])
+      status, head, body = settings.service.get(escaped)
+      [status, head, simple_escape(body)]
     end
 
     post "/" do
-      url  = settings.db.parse_url params[:url].to_s
-
-      if !(url && url.scheme =~ /^https?$/)
-        halt 422, simple_escape("Invalid url: #{url}")
-      end
+      status, head, body = settings.service.create(params[:url], params[:code])
 
-      case settings.required_host
-      when String
-        if url.host != settings.required_host
-          halt 422, simple_escape("URL must be from #{settings.required_host}")
-        end
-      when Regexp
-        if url.host.to_s !~ settings.required_host
-          halt 422, simple_escape("URL must match #{settings.required_host.inspect}")
-        end
+      if loc = head['Location']
+        head['Location'] = File.join(request.url, loc)
       end
 
-      begin
-        if code = settings.db.add(url.to_s, params[:code])
-          redirect code, 201
-        else
-          halt 422, simple_escape("Unable to shorten #{url}")
-        end
-      rescue Guillotine::DuplicateCodeError => err
-        halt 422, simple_escape(err.to_s)
-      end
+      [status, head, simple_escape(body)]
     end
 
     # Guillotine output is supposed to be text/plain friendly, so only strip
     # /<|>/.  Broken tie fighter :(  If you're passing these characters in,
     # you're probably doing something naughty.
     def simple_escape(s)
+      s = s.to_s
       s.gsub! /<|>/, ''
       s
     end
   end
 end
+

data/lib/guillotine/service.rb

@@ -0,0 +1,132 @@
+module Guillotine
+  class Service 
+    class NullChecker 
+      def call(url)
+      end
+    end
+
+    # This is the public API to the Guillotine service.  Wire this up to Sinatra
+    # or whatever.  Every public method should return a compatible Rack Response:
+    # [Integer Status, Hash headers, String body].  
+    #
+    # db            - A Guillotine::Adapter instance.
+    # required_host - Either a String or Regex limiting which domains the
+    #                 shortened URLs can come from.
+    #
+    def initialize(db, required_host = nil)
+      @db = db
+      build_host_check(required_host)
+    end
+
+    # Public: Gets the full URL for a shortened code.
+    #
+    # code - A String short code.
+    #
+    # Returns 302 with the Location header pointing to the URL on a hit,
+    # or 404 on a miss.
+    def get(code)
+      if url = @db.find(code)
+        [302, {"Location" => @db.parse_url(url).to_s}]
+      else
+        [404, {}, "No url found for #{code}"]
+      end
+    end
+
+    # Public: Maps a URL to a shortened code.
+    #
+    # url  - A String or Addressable::URI URL to shorten.
+    # code - Optional String code to use.  Defaults to a random String.
+    #
+    # Returns 201 with the Location pointing to the code, or 422.
+    def create(url, code = nil)
+      url = ensure_url(url)
+
+      if resp = check_host(url)
+        return resp
+      end
+      
+      begin
+        if code = @db.add(url.to_s, code)
+          [201, {"Location" => code}]
+        else
+          [422, {}, "Unable to shorten #{url}"]
+        end
+      rescue DuplicateCodeError => err
+        [422, {}, err.to_s]
+      end
+    end
+
+    # Checks to see if the input URL is using a valid host.  You can constrain
+    # the hosts with the `required_host` argument of the Service constructor.
+    #
+    # url - An Addressible::URI instance to check.
+    #
+    # Returns a 422 Rack::Response if the host is invalid, or nil.
+    def check_host(url)
+      if url.scheme !~ /^https?$/
+        [422, {}, "Invalid url: #{url}"]
+      else
+        @host_check.call url
+      end
+    end
+
+    # Converts the `required_host` argument to a lambda for #check_host.
+    #
+    # host_check - Either a String or Regex limiting which domains the
+    #              shortened URLs can come from.
+    #
+    # Returns nothing.
+    def build_host_check(host_check)
+      case host_check
+      when nil
+        @host_check = NullChecker.new
+      when Regexp
+        build_host_regex_check(host_check)
+      else
+        build_host_string_check(host_check.to_s)
+      end
+    end
+
+    # Builds the host check lambda for regexes.
+    #
+    # regex - The Regexp that limits allowable URL hosts.
+    #
+    # Returns a Lambda that verifies an Addressible::URI.
+    def build_host_regex_check(regex)
+      @host_check = lambda do |url|
+        if url.host.to_s !~ regex
+          [422, {}, "URL must match #{regex.inspect}"]
+        end
+      end
+    end
+
+    # Builds the host check lambda for Strings.
+    #
+    # hostname - The String that limits allowable URL hosts.
+    #
+    # Returns a Lambda that verifies an Addressible::URI.
+    def build_host_string_check(hostname)
+      @host_check = lambda do |url|
+        if url.host != hostname
+          [422, {}, "URL must be from #{hostname}"]
+        end
+      end
+    end
+
+    # Ensures that the argument is an Addressable::URI.
+    #
+    # str - A String URL or an Addressable::URI.
+    #
+    # Returns an Addressable::URI.
+    def ensure_url(str)
+      if str.respond_to?(:scheme)
+        str
+      else
+        str = str.to_s
+        str.gsub! /\s/, ''
+        str.gsub! /(\#|\?).*/, ''
+        Addressable::URI.parse str
+      end
+    end
+  end
+end

data/lib/guillotine.rb

@@ -3,9 +3,10 @@ require 'digest/md5'
 require 'addressable/uri'
 
 module Guillotine
-  VERSION = "1.0.8"
+  VERSION = "1.1.0"
 
   dir = File.expand_path '../guillotine', __FILE__
+  require "#{dir}/service"
   autoload :App, "#{dir}/app"
 
   class DuplicateCodeError < StandardError
@@ -25,6 +26,8 @@ module Guillotine
     autoload :SequelAdapter,       "#{dir}/sequel_adapter"
     autoload :RiakAdapter,         "#{dir}/riak_adapter"
     autoload :ActiveRecordAdapter, "#{dir}/active_record_adapter"
+    autoload :RedisAdapter,        "#{dir}/redis_adapter"
+    autoload :MongoAdapter,        "#{dir}/mongo_adapter"
 
     # Adapters handle the storage and retrieval of URLs in the system.  You can
     # use whatever you want, as long as it implements the #add and #find

data/script/cibuild

@@ -0,0 +1,2 @@
+bundle install --binstubs --path vendor/gems
+bin/rake 

data/test/active_record_adapter_test.rb

@@ -11,24 +11,24 @@ begin
     end
 
     def test_adding_a_link_returns_code
-      code = @db.add 'abc'
-      assert_equal 'abc', @db.find(code)
+      code = @db.add 'aaa'
+      assert_equal 'aaa', @db.find(code)
     end
 
     def test_adding_duplicate_link_returns_same_code
-      code = @db.add 'abc'
-      assert_equal code, @db.add('abc')
+      code = @db.add 'bbb'
+      assert_equal code, @db.add('bbb')
     end
 
     def test_adds_url_with_custom_code
-      assert_equal 'code', @db.add('def', 'code')
-      assert_equal 'def', @db.find('code')
+      assert_equal 'code', @db.add('ccc', 'code')
+      assert_equal 'ccc', @db.find('code')
     end
 
     def test_clashing_urls_raises_error
-      code = @db.add '123'
+      code = @db.add 'ddd'
       assert_raises Guillotine::DuplicateCodeError do
-        code = @db.add '456', code
+        code = @db.add 'eee', code
       end
     end
 
@@ -37,15 +37,15 @@ begin
     end
 
     def test_gets_code_for_url
-      code = @db.add 'abc'
-      assert_equal code, @db.code_for('abc')
+      code = @db.add 'fff'
+      assert_equal code, @db.code_for('fff')
     end
 
     def test_clears_code_for_url
-      code = @db.add 'abc'
-      assert_equal 'abc', @db.find(code)
+      code = @db.add 'ggg'
+      assert_equal 'ggg', @db.find(code)
 
-      @db.clear 'abc'
+      @db.clear 'ggg'
 
       assert_nil @db.find(code)
     end

data/test/app_test.rb

@@ -1,119 +1,123 @@
 require File.expand_path('../helper', __FILE__)
 
-class AppTest < Guillotine::TestCase
-  ADAPTER = Guillotine::Adapters::MemoryAdapter.new
-  Guillotine::App.set :db, ADAPTER
-
-  include Rack::Test::Methods
-
-  def test_adding_a_link_returns_code
-    url = 'http://github.com'
-    post '/', :url => url + '?a=1'
-    assert_equal 201, last_response.status
-    assert code_url = last_response.headers['Location']
-    code = code_url.gsub(/.*\//, '')
-
-    get "/#{code}"
-    assert_equal 302, last_response.status
-    assert_equal url, last_response.headers['Location']
-  end
-
-  def test_adding_duplicate_link_returns_same_code
-    url  = 'http://github.com'
-    code = ADAPTER.add url
-
-    post '/', :url => url + '#a=1'
-    assert code_url = last_response.headers['Location']
-    assert_equal code, code_url.gsub(/.*\//, '')
-  end
-
-  def test_adds_url_with_custom_code
-    url = 'http://github.com/abc'
-    post '/', :url => url, :code => 'code'
-    assert code_url = last_response.headers['Location']
-    assert_match /\/code$/, code_url
-
-    get "/code"
-    assert_equal 302, last_response.status
-    assert_equal url, last_response.headers['Location']
-  end
-
-  def test_adds_url_with_custom_code
-    url = 'http://github.com/abc'
-    post '/', :url => url, :code => '%E2%9C%88'
-    assert code_url = last_response.headers['Location']
-    assert_match /\/%E2%9C%88$/, code_url
-
-    get "/%E2%9C%88"
-    assert_equal 302, last_response.status
-    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
-    assert_equal 422, last_response.status
-  end
-
-  def test_add_without_url
-    post '/'
-    assert_equal 422, last_response.status
-  end
-
-  def test_add_url_with_linebreak
-    post '/', :url => "https://abc.com\n"
-    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
-  end
-
-  def test_reject_shortened_url_from_other_domain
-    Guillotine::App.set :required_host, 'abc.com'
-    post '/', :url => 'http://github.com'
-    assert_equal 422, last_response.status
-    assert_match /must be from abc\.com/, last_response.body
-
-    post '/', :url => 'http://abc.com/def'
-    assert_equal 201, last_response.status
-  ensure
-    Guillotine::App.set :required_host, nil
-  end
-
-  def test_reject_shortened_url_from_other_domain_by_regex
-    Guillotine::App.set :required_host, /abc\.com$/
-    post '/', :url => 'http://github.com'
-    assert_equal 422, last_response.status
-    assert_match /must match \/abc\\.com/, last_response.body
-
-    post '/', :url => 'http://abc.com/def'
-    assert_equal 201, last_response.status
-
-    post '/', :url => 'http://www.abc.com/def'
-    assert_equal 201, last_response.status
-  ensure
-    Guillotine::App.set :required_host, nil
-  end
-
-  def app
-    Guillotine::App
+module Guillotine
+  class AppTest < TestCase
+    ADAPTER = Adapters::MemoryAdapter.new
+    SERVICE = Service.new(ADAPTER)
+    App.set :service, SERVICE
+
+    include Rack::Test::Methods
+
+    def test_adding_a_link_returns_code
+      url = 'http://github.com'
+      post '/', :url => url + '?a=1'
+      assert_equal 201, last_response.status
+      assert code_url = last_response.headers['Location']
+      code = code_url.gsub(/.*\//, '')
+
+      get "/#{code}"
+      assert_equal 302, last_response.status
+      assert_equal url, last_response.headers['Location']
+    end
+
+    def test_adding_duplicate_link_returns_same_code
+      url  = 'http://github.com'
+      code = ADAPTER.add url
+
+      post '/', :url => url + '#a=1'
+      assert code_url = last_response.headers['Location']
+      assert_equal code, code_url.gsub(/.*\//, '')
+    end
+
+    def test_adds_url_with_custom_code
+      url = 'http://github.com/abc'
+      post '/', :url => url, :code => 'code'
+      assert code_url = last_response.headers['Location']
+      assert_match /\/code$/, code_url
+
+      get "/code"
+      assert_equal 302, last_response.status
+      assert_equal url, last_response.headers['Location']
+    end
+
+    def test_adds_url_with_custom_code
+      url = 'http://github.com/abc'
+      post '/', :url => url, :code => '%E2%9C%88'
+      assert code_url = last_response.headers['Location']
+      assert_match /\/%E2%9C%88$/, code_url
+
+      get "/%E2%9C%88"
+      assert_equal 302, last_response.status
+      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
+      assert_equal 422, last_response.status
+    end
+
+    def test_add_without_url
+      post '/'
+      assert_equal 422, last_response.status
+    end
+
+    def test_add_url_with_linebreak
+      post '/', :url => "https://abc.com\n"
+      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
+    end
+
+    def test_reject_shortened_url_from_other_domain
+      App.set :service, Service.new(ADAPTER, 'abc.com')
+      post '/', :url => 'http://github.com'
+      assert_equal 422, last_response.status
+      assert_match /must be from abc\.com/, last_response.body
+
+      post '/', :url => 'http://abc.com/def'
+      assert_equal 201, last_response.status
+    ensure
+      Guillotine::App.set :required_host, nil
+    end
+
+    def test_reject_shortened_url_from_other_domain_by_regex
+      App.set :service, Service.new(ADAPTER, /abc\.com$/)
+      post '/', :url => 'http://github.com'
+      assert_equal 422, last_response.status
+      assert_match /must match \/abc\\.com/, last_response.body
+
+      post '/', :url => 'http://abc.com/def'
+      assert_equal 201, last_response.status
+
+      post '/', :url => 'http://www.abc.com/def'
+      assert_equal 201, last_response.status
+    ensure
+      App.set :service, SERVICE
+    end
+
+    def app
+      App
+    end
   end
 end
+

data/test/mongo_adapter_test.rb

@@ -0,0 +1,56 @@
+require File.expand_path('../helper', __FILE__)
+
+begin
+  require 'mongo'
+
+  class MongoAdapterTest < Guillotine::TestCase
+    def setup
+      @collection = Mongo::Connection.new.db('test').collection('guillotine')
+      @collection.drop
+      @db = Guillotine::Adapters::MongoAdapter.new(@collection)
+    end
+
+    def test_adding_a_link_returns_code
+      code = @db.add 'abc'
+      assert_equal 'abc', @db.find(code)
+    end
+
+    def test_adding_duplicate_link_returns_same_code
+      code = @db.add 'abc'
+      assert_equal code, @db.add('abc')
+    end
+
+    def test_adds_url_with_custom_code
+      assert_equal 'code', @db.add('def', 'code')
+      assert_equal 'def', @db.find('code')
+    end
+
+    def test_clashing_urls_raises_error
+      code = @db.add 'abc'
+      assert_raises Guillotine::DuplicateCodeError do
+        @db.add 'def', code
+      end
+    end
+
+    def test_missing_code
+      assert_nil @db.find('missing')
+    end
+
+    def test_gets_code_for_url
+      code = @db.add 'abc'
+      assert_equal code, @db.code_for('abc')
+    end
+
+    def test_clears_code_for_url
+      code = @db.add 'abc'
+      assert_equal 'abc', @db.find(code)
+
+      @db.clear 'abc'
+
+      assert_nil @db.find(code)
+    end
+  end
+rescue LoadError
+  puts "Skipping MongoDB tests: #{$!}"
+end
+

data/test/redis_adapter_test.rb

@@ -0,0 +1,56 @@
+require File.expand_path('../helper', __FILE__)
+
+begin
+  require "redis"
+
+  class RedisAdapterTest < Guillotine::TestCase
+    redis = Redis.new
+    ADAPTER = Guillotine::Adapters::RedisAdapter.new redis
+
+    def setup
+      @db = ADAPTER
+    end
+
+    def test_adding_a_link_returns_code
+      code = @db.add 'abc'
+      assert_equal 'abc', @db.find(code)
+    end
+
+    def test_adding_duplicate_link_returns_same_code
+      code = @db.add 'abc'
+      assert_equal code, @db.add('abc')
+    end
+
+    def test_adds_url_with_custom_code
+      assert_equal 'code', @db.add('def', 'code')
+      assert_equal 'def', @db.find('code')
+    end
+
+    def test_clashing_urls_raises_error
+      code = @db.add 'abc'
+      assert_raise Guillotine::DuplicateCodeError do
+        @db.add 'ghi', code
+      end
+    end
+
+    def test_missing_code
+      assert_nil @db.find('missing')
+    end
+
+    def test_gets_code_for_url
+      code = @db.add 'abc'
+      assert_equal code, @db.code_for('abc')
+    end
+
+    def test_clears_code_for_url
+      code = @db.add 'abc'
+      assert_equal 'abc', @db.find(code)
+
+      @db.clear 'abc'
+
+      assert_nil @db.find(code)
+    end
+  end
+rescue LoadError
+  puts "Skipping Redis tests: #{$!}"
+end

data/test/riak_adapter_test.rb

@@ -2,6 +2,12 @@ require File.expand_path('../helper', __FILE__)
 
 begin
   require 'riak/client'
+  # try Riak::Client with the default Riak port
+  RIAK_TEST_CLIENT = Riak::Client.new
+  # now try it with the default Riak dev port
+  RIAK_TEST_CLIENT.http_port = 8091 unless RIAK_TEST_CLIENT.ping
+
+  raise LoadError, "Could not ping (#{RIAK_TEST_CLIENT.inspect})" unless RIAK_TEST_CLIENT.ping
 
   # Assumes a local dev install of riak is setup
   #
@@ -11,9 +17,8 @@ begin
   #
   #   http://localhost:8091/riak/guillotine-test
   class RiakAdapterTest < Guillotine::TestCase
-    client      = Riak::Client.new(:http_port => 8091)
-    CODE_BUCKET = client["guillotine-code-test-#{Process.pid}"]
-    URL_BUCKET  = client["guillotine-url-test-#{Process.pid}"]
+    CODE_BUCKET = RIAK_TEST_CLIENT["guillotine-code-test-#{Process.pid}"]
+    URL_BUCKET  = RIAK_TEST_CLIENT["guillotine-url-test-#{Process.pid}"]
     ADAPTER = Guillotine::Adapters::RiakAdapter.new CODE_BUCKET, URL_BUCKET
 
     def setup

data/test/service_test.rb

@@ -0,0 +1,115 @@
+require File.expand_path('../helper', __FILE__)
+
+module Guillotine
+  class ServiceTest < TestCase
+    def setup
+      @db = Adapters::MemoryAdapter.new
+      @service = Service.new @db
+    end
+
+    def test_adding_a_link_returns_code
+      url = 'http://github.com'
+      status, head, body = @service.create(url + '?a=1')
+      assert_equal 201, status
+      assert code_url = head['Location']
+      code = code_url.gsub(/.*\//, '')
+
+      status, head, body = @service.get(code)
+      assert_equal 302, status
+      assert_equal url, head['Location']
+    end
+
+    def test_adding_duplicate_link_returns_same_code
+      url  = 'http://github.com'
+      code = @db.add url
+
+      status, head, body = @service.create(url + '#a=1')
+      assert code_url = head['Location']
+      assert_equal code, code_url.gsub(/.*\//, '')
+    end
+
+    def test_adds_url_with_custom_code
+      url = 'http://github.com/abc'
+
+      status, head, body = @service.create(url, 'code')
+      assert code_url = head['Location']
+      assert_equal 'code', code_url
+
+      status, head, body = @service.get('code')
+      assert_equal 302, status
+      assert_equal url, head['Location']
+    end
+
+    def test_adds_url_with_custom_unicode
+      url = 'http://github.com/abc'
+      status, head, body = @service.create(url, '%E2%9C%88')
+      assert code_url = head['Location']
+      assert_match /^%E2%9C%88$/, code_url
+
+      status, head, body = @service.get("%E2%9C%88")
+      assert_equal 302, status
+      assert_equal url, head['Location']
+    end
+
+    def test_redirects_to_split_url
+      url = "http://abc.com\nhttp//def.com"
+      @db.hash['split'] = url
+      @db.urls[url] = 'split'
+
+      status, head, body = @service.get('split')
+      assert_equal "http://abc.comhttp//def.com", head['Location']
+    end
+
+    def test_clashing_urls_raises_error
+      code = @db.add 'http://github.com/123'
+      status, head, body = @service.create('http://github.com/456', code)
+      assert_equal 422, status
+    end
+
+    def test_add_without_url
+      status, head, body = @service.create(nil)
+      assert_equal 422, status
+    end
+
+    def test_add_url_with_linebreak
+      status, head, body = @service.create("https://abc.com\n")
+      assert_equal 'SWtBvQ', head['Location']
+    end
+
+    def test_adds_split_url
+      status, head, body = @service.create("https://abc.com\nhttp://abc.com")
+      assert_equal 'cb5CNA', head['Location']
+
+      assert_equal 'https://abc.comhttp//abc.com', @db.find('cb5CNA')
+    end
+
+    def test_rejects_non_http_urls
+      status, head, body = @service.create('ftp://abc.com')
+      assert_equal 422, status
+    end
+
+    def test_reject_shortened_url_from_other_domain
+      service = Service.new @db, 'abc.com'
+      status, head, body = service.create('http://github.com')
+      assert_equal 422, status
+      assert_match /must be from abc\.com/, body
+
+      status, head, body = service.create('http://abc.com/def')
+      assert_equal 201, status
+    end
+
+    def test_reject_shortened_url_from_other_domain_by_regex
+      service = Service.new @db, /abc\.com$/
+      status, head, body = service.create('http://github.com')
+      assert_equal 422, status
+      assert_match /must match \/abc\\.com/, body
+
+      status, head, body = service.create('http://abc.com/def')
+      assert_equal 201, status
+
+      status, head, body = service.create('http://www.abc.com/def')
+      assert_equal 201, status
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guillotine
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000Z
+date: 2011-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70215141118220 !ruby/object:Gem::Requirement
+  requirement: &70212478964620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70215141118220
+  version_requirements: *70212478964620
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70215141117700 !ruby/object:Gem::Requirement
+  requirement: &70212478964160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70215141117700
+  version_requirements: *70212478964160
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70215141117280 !ruby/object:Gem::Requirement
+  requirement: &70212478980140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70215141117280
+  version_requirements: *70212478980140
 description: Adaptable private URL shortener
 email: technoweenie@gmail.com
 executables: []
@@ -59,15 +59,22 @@ files:
 - lib/guillotine.rb
 - lib/guillotine/adapters/active_record_adapter.rb
 - lib/guillotine/adapters/memory_adapter.rb
+- lib/guillotine/adapters/mongo_adapter.rb
+- lib/guillotine/adapters/redis_adapter.rb
 - lib/guillotine/adapters/riak_adapter.rb
 - lib/guillotine/adapters/sequel_adapter.rb
 - lib/guillotine/app.rb
+- lib/guillotine/service.rb
+- script/cibuild
 - test/active_record_adapter_test.rb
 - test/app_test.rb
 - test/helper.rb
 - test/memory_adapter_test.rb
+- test/mongo_adapter_test.rb
+- test/redis_adapter_test.rb
 - test/riak_adapter_test.rb
 - test/sequel_adapter_test.rb
+- test/service_test.rb
 homepage: https://github.com/technoweenie/gitio
 licenses: []
 post_install_message: 
@@ -80,6 +87,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2311963122741215687
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: guillotine
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 2
 summary: Adaptable private URL shortener
@@ -96,5 +106,8 @@ test_files:
 - test/active_record_adapter_test.rb
 - test/app_test.rb
 - test/memory_adapter_test.rb
+- test/mongo_adapter_test.rb
+- test/redis_adapter_test.rb
 - test/riak_adapter_test.rb
 - test/sequel_adapter_test.rb
+- test/service_test.rb