guillotine 1.2.1 → 1.3.0

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## v1.3.0
+
+* Add Cassandra Adapter [rajeshucsb]
+* Add option to stop stripping URL queries or Anchors. [mrtazz]
+
+        class MyApp < Guillotine::App
+          db = Sequel.sqlite
+          adapter = Guillotine::Adapters::SequelAdapter.new(db)
+
+          # OLD required host configuration, deprecated
+          set :service => Guillotine::Service.new(adapter, 'github.com')
+
+          # NEW required host configuration.
+          set :service => Guillotine::Service.new(adapter,
+            :required_host => 'github.com', :strip_query => false)
+        end
+
 ## v1.2.1
 
 * Fix WildcardHostChecker error responses.

data/README.md

@@ -50,7 +50,7 @@ require 'guillotine'
 require 'sequel'
 module MyApp
   class App < Guillotine::App
-    db = Sequel.sqlite 
+    db = Sequel.sqlite
     adapter = Guillotine::Adapters::SequelAdapter.new(db)
     set :service => Guillotine::Service.new(adapter)
   end
@@ -106,6 +106,41 @@ module MyApp
 end
 ```
 
+## Cassandra
+
+you can use Cassandra!
+
+```ruby
+require 'guillotine'
+require 'cassandra'
+
+module MyApp
+  class App < Guillotine::App
+    cassandra = Cassandra.new('url_shortener', '127.0.0.1:9160')
+    adapter = Guillotine::Adapters::CassandraAdapter.new(cassandra)
+
+    set :service => Guillotine::Service.new(adapter)
+  end
+end
+```
+
+You need to create keyspace and column families as below
+
+```sql
+CREATE KEYSPACE url_shortener;
+USE url_shortener;
+
+CREATE COLUMN FAMILY urls
+WITH comparator = UTF8Type
+AND key_validation_class=UTF8Type
+AND column_metadata = [{column_name: code, validation_class: UTF8Type}];
+
+CREATE COLUMN FAMILY codes
+WITH comparator = UTF8Type
+AND key_validation_class=UTF8Type
+AND column_metadata = [{column_name: url, validation_class: UTF8Type}];
+```
+
 ## Domain Restriction
 
 You can restrict what domains that Guillotine will shorten.
@@ -117,15 +152,15 @@ module MyApp
     adapter = Guillotine::Adapters::MemoryAdapter.new
     # only this domain
     set :service => Guillotine::Service.new(adapter,
-      'github.com')
+      :required_host => 'github.com')
 
     # or, any *.github.com domain
     set :service => Guillotine::Service.new(adapter,
-      /(^|\.)github\.com$/)
+      :required_host => /(^|\.)github\.com$/)
 
     # or set a simple wildcard
     set :service => Guillotine::Servicew.new(adapter,
-      '*.github.com')
+      :required_host => '*.github.com')
   end
 end
 ```

data/config/cassandra_config.json

@@ -0,0 +1,10 @@
+{
+  "url_shortener":{
+      "urls":{
+        "comparator_type":"org.apache.cassandra.db.marshal.UTF8Type",
+        "column_type":"Standard"},
+      "codes":{
+        "comparator_type":"org.apache.cassandra.db.marshal.UTF8Type",
+        "column_type":"Standard"}
+    }
+}

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.2.1'
-  s.date              = '2012-06-04'
+  s.version           = '1.3.0'
+  s.date              = '2012-08-19'
   s.rubyforge_project = 'guillotine'
 
   ## Make sure your summary is short. The description may be as long
@@ -52,10 +52,12 @@ Gem::Specification.new do |s|
     LICENSE
     README.md
     Rakefile
+    config/cassandra_config.json
     config/haproxy.riak.cfg
     guillotine.gemspec
     lib/guillotine.rb
     lib/guillotine/adapters/active_record_adapter.rb
+    lib/guillotine/adapters/cassandra_adapter.rb
     lib/guillotine/adapters/memory_adapter.rb
     lib/guillotine/adapters/mongo_adapter.rb
     lib/guillotine/adapters/redis_adapter.rb
@@ -67,10 +69,12 @@ Gem::Specification.new do |s|
     script/cibuild
     test/active_record_adapter_test.rb
     test/app_test.rb
+    test/cassandra_adapter_test.rb
     test/helper.rb
     test/host_checker_test.rb
     test/memory_adapter_test.rb
     test/mongo_adapter_test.rb
+    test/options_test.rb
     test/redis_adapter_test.rb
     test/riak_adapter_test.rb
     test/sequel_adapter_test.rb

data/lib/guillotine.rb

@@ -3,7 +3,7 @@ require 'digest/md5'
 require 'addressable/uri'
 
 module Guillotine
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 
   class Error < StandardError
   end
@@ -23,7 +23,7 @@ module Guillotine
   # use whatever you want, as long as it implements the #add and #find
   # methods.  See MemoryAdapter for a simple solution.
   class Adapter
-    # Public: Shortens a given URL to a short code.
+    # Internal: Shortens a given URL to a short code.
     #
     # 1) MD5 hash the URL to the hexdigest
     # 2) Convert it to a Bignum
@@ -37,16 +37,57 @@ module Guillotine
       Base64.urlsafe_encode64([Digest::MD5.hexdigest(url).to_i(16)].pack("N")).sub(/==\n?$/, '')
     end
 
+    # Internal: Shortens a URL with a specific character set at a certain
+    # length.
+    #
+    # url     - String URL to shorten.
+    # length  - Optional Integer maximum length of the short code desired.
+    # charset - Optional Array of String characters which will be present in
+    #           short code.  eg. ['a', 'b', 'c', 'd', 'e', 'f']
+    #
+    # Returns an encoded String code for the URL.
+    def shorten_fixed_charset(url, length, char_set)
+      number = (Digest::MD5.hexdigest(url).to_i(16) % (char_set.size**length))
+
+      code = ""
+
+      while (number > 0)
+        code =  code + char_set[number % char_set.size]
+        number /= char_set.size
+      end
+
+      code
+    end
+
     # Parses and sanitizes a URL.
     #
-    # url - A String URL.
+    # url     - A String URL.
+    # options - A Guillotine::Service::Options object.
     #
     # Returns an Addressable::URI.
-    def parse_url(url)
-      url.gsub! /\s/, ''
-      url.gsub! /(\#|\?).*/, ''
-      Addressable::URI.parse url
+    def parse_url(url, options)
+      url.gsub!(/\s/, '')
+      url.gsub!(/\?.*/, '') if options.strip_query?
+      url.gsub!(/\#.*/, '') if options.strip_anchor?
+      Addressable::URI.parse(url)
     end
+
+    # Internal: Shortens a URL with the given options.
+    #
+    # url     - A String URL.
+    # code    - Optional String code.
+    # options - Optional Guillotine::Service::Options to specify how the code
+    #           is generated.
+    #
+    # returns a String code.
+    def get_code(url, code = nil, options = nil)
+      code ||= if options && options.with_charset?
+        shorten_fixed_charset(url, options.length, options.charset)
+      else
+        shorten(url)
+      end
+    end
+
   end
 
   dir = File.expand_path '../guillotine/adapters', __FILE__
@@ -56,6 +97,7 @@ module Guillotine
   autoload :ActiveRecordAdapter, dir + "/active_record_adapter"
   autoload :RedisAdapter,        dir + "/redis_adapter"
   autoload :MongoAdapter,        dir + "/mongo_adapter"
+  autoload :CassandraAdapter,    dir + "/cassandra_adapter"
 
   dir = File.expand_path '../guillotine', __FILE__
   autoload :App, "#{dir}/app"

data/lib/guillotine/adapters/active_record_adapter.rb

@@ -10,16 +10,18 @@ module Guillotine
 
     # Public: Stores the shortened version of a URL.
     #
-    # url  - The String URL to shorten and store.
-    # code - Optional String code for the URL.
+    # url     - The String URL to shorten and store.
+    # code    - Optional String code for the URL.
+    # options - Optional Guillotine::Service::Options
     #
     # 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)
+    def add(url, code = nil, options = nil)
       if row = Url.select(:code).where(:url => url).first
         row[:code]
       else
-        code ||= shorten url
+        code = get_code(url, code, options)
+
         begin
           Url.create :url => url, :code => code
         rescue ActiveRecord::RecordNotUnique, ActiveRecord::StatementInvalid

data/lib/guillotine/adapters/cassandra_adapter.rb

@@ -0,0 +1,67 @@
+module Guillotine
+  class CassandraAdapter < Adapter
+    # Public: Initialise the adapter with a Redis instance.
+    #
+    # cassandra - A Cassandra instance to persist urls and codes to.
+    def initialize(cassandra, read_only = false)
+      @cassandra = cassandra
+      @read_only = read_only
+    end
+
+    # Public: Stores the shortened version of a URL.
+    #
+    # url     - The String URL to shorten and store.
+    # code    - Optional String code for the URL.
+    # options - Optional Guillotine::Service::Options
+    #
+    # 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, options = nil)
+      return if @read_only
+      if existing_code = code_for(url)
+        existing_code
+      else
+        code = get_code(url, code, options)
+
+        if existing_url = find(code)
+          raise DuplicateCodeError.new(existing_url, url, code) if url != existing_url
+        end
+        @cassandra.insert("codes", code, 'url' => url)
+        @cassandra.insert("urls", url, 'code' => 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)
+      obj = @cassandra.get("codes", code)
+      obj.nil? ? nil : obj["url"]
+    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)
+      obj = @cassandra.get("urls", url)
+      obj.nil? ? nil : obj["code"]
+    end
+
+    # Public: Removes the assigned short code for a URL.
+    #
+    # url - The String URL to remove.
+    #
+    # Returns nothing.
+    def clear(url)
+      if code = code_for(url)
+        @cassandra.remove("urls", url)
+        @cassandra.remove("codes", code)
+      end
+    end
+  end
+end

data/lib/guillotine/adapters/memory_adapter.rb

@@ -8,16 +8,18 @@ module Guillotine
 
     # Public: Stores the shortened version of a URL.
     #
-    # url  - The String URL to shorten and store.
-    # code - Optional String code for the URL.
+    # url     - The String URL to shorten and store.
+    # code    - Optional String code for the URL.
+    # options - Optional Guillotine::Service::Options
     #
     # 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)
+    def add(url, code = nil, options = nil)
       if existing_code = @urls[url]
         existing_code
       else
-        code ||= shorten(url)
+        code = get_code(url, code, options)
+
         if existing_url = @hash[code]
           raise DuplicateCodeError.new(existing_url, url, code) if url != existing_url
         end
@@ -62,3 +64,4 @@ module Guillotine
     end
   end
 end
+

data/lib/guillotine/adapters/mongo_adapter.rb

@@ -15,13 +15,14 @@ module Guillotine
 
     # Public: Stores the shortened version of a URL.
     #
-    # url  - The String URL to shorten and store.
-    # code - Optional String code for the URL.
+    # url     - The String URL to shorten and store.
+    # code    - Optional String code for the URL.
+    # options - Optional Guillotine::Service::Options
     #
     # 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))
+    def add(url, code = nil, options = nil)
+      code_for(url) || insert(url, get_code(url, code, options))
     end
 
 
@@ -31,7 +32,7 @@ module Guillotine
     #
     # Returns the String URL, or nil if none is found.
     def find(code)
-      select :url, :_id => code
+      select(:url, :_id => code)
     end
 
     # Public: Retrieves the code for a given URL.
@@ -40,7 +41,7 @@ module Guillotine
     #
     # Returns the String code, or nil if none is found.
     def code_for(url)
-      select :code, :url => url
+      select(:code, :url => url)
     end
 
     # Public: Removes the assigned short code for a URL.
@@ -66,3 +67,4 @@ module Guillotine
     end
   end
 end
+

data/lib/guillotine/adapters/redis_adapter.rb

@@ -9,16 +9,18 @@ module Guillotine
 
     # Public: Stores the shortened version of a URL.
     #
-    # url  - The String URL to shorten and store.
-    # code - Optional String code for the URL.
+    # url     - The String URL to shorten and store.
+    # code    - Optional String code for the URL.
+    # options - Optional Guillotine::Service::Options
     #
     # 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)
+    def add(url, code = nil, options = nil)
       if existing_code = @redis.get(url_key(url))
         existing_code
       else
-        code ||= shorten(url)
+        code = get_code(url, code, options)
+
         if existing_url = @redis.get(code_key(code))
           raise DuplicateCodeError.new(existing_url, url, code) if url != existing_url
         end

data/lib/guillotine/adapters/riak_adapter.rb

@@ -17,13 +17,14 @@ module Guillotine
     end
 
     # Public: Stores the shortened version of a URL.
-    # 
-    # url  - The String URL to shorten and store.
-    # code - Optional String code for the URL.
+    #
+    # url     - The String URL to shorten and store.
+    # code    - Optional String code for the URL.
+    # options - Optional Guillotine::Service::Options
     #
     # 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)
+    def add(url, code = nil, options = nil)
       sha     = url_key url
       url_obj = @url_bucket.get_or_new sha, :r => 1
       if url_obj.raw_data
@@ -31,7 +32,7 @@ module Guillotine
         code = url_obj.data
       end
 
-      code   ||= shorten url
+      code = get_code(url, code, options)
       code_obj = @code_bucket.get_or_new code
       code_obj.content_type = url_obj.content_type = PLAIN
 

data/lib/guillotine/adapters/sequel_adapter.rb

@@ -7,16 +7,17 @@ module Guillotine
 
     # Public: Stores the shortened version of a URL.
     #
-    # url  - The String URL to shorten and store.
-    # code - Optional String code for the URL.
+    # url     - The String URL to shorten and store.
+    # code    - Optional String code for the URL.
+    # options - Optional Guillotine::Service::Options
     #
     # 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)
+    def add(url, code = nil, options = nil)
       if existing = code_for(url)
         existing
       else
-        code ||= shorten url
+        code = get_code(url, code, options)
         begin
           @table << {:url => url, :code => code}
         rescue Sequel::DatabaseError

data/lib/guillotine/app.rb

@@ -6,6 +6,13 @@ module Guillotine
   class App < Sinatra::Base
     set :service, nil
 
+    get "/" do
+      if params[:code].nil?
+        default_url = settings.service.default_url
+        redirect default_url if !default_url.nil?
+      end
+    end
+
     get "/:code" do
       escaped = Addressable::URI.escape(params[:code])
       status, head, body = settings.service.get(escaped)

data/lib/guillotine/service.rb

@@ -3,6 +3,46 @@ module Guillotine
     # Deprecated until v2
     NullChecker = Guillotine::HostChecker
 
+    # length  - Optional Integer maximum length of the short code desired.
+    # charset - Optional Array of String characters which will be present in
+    #           short code.  eg. ['a', 'b', 'c', 'd', 'e', 'f']
+    class Options < Struct.new(:required_host, :strip_query, :strip_anchor,
+                               :length, :charset, :default_url)
+      def self.from(value)
+        case value
+        when nil, "" then new
+        when String, Regexp then new(value)
+        when Hash then
+          opt = new
+          value.each do |key, value|
+            opt[key] = value
+          end
+          opt
+        when self then value
+        else
+          raise ArgumentError, "Unable to convert to Options: #{value.inspect}"
+        end
+      end
+
+      def strip_query?
+        strip_query != false
+      end
+
+      def strip_anchor?
+        strip_anchor != false
+      end
+
+      def with_charset?
+        !(length.nil? || charset.nil?)
+      end
+
+      def host_checker
+        @host_checker ||= HostChecker.matching(required_host)
+      end
+    end
+
+    attr_reader :db, :options
+
     # 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].
@@ -11,9 +51,9 @@ module Guillotine
     # required_host - Either a String or Regex limiting which domains the
     #                 shortened URLs can come from.
     #
-    def initialize(db, required_host = nil)
+    def initialize(db, value = nil)
       @db = db
-      @host_check = HostChecker.matching(required_host)
+      @options = Options.from(value)
     end
 
     # Public: Gets the full URL for a shortened code.
@@ -24,7 +64,7 @@ module Guillotine
     # or 404 on a miss.
     def get(code)
       if url = @db.find(code)
-        [302, {"Location" => @db.parse_url(url).to_s}]
+        [302, {"Location" => parse_url(url).to_s}]
       else
         [404, {}, "No url found for #{code}"]
       end
@@ -44,7 +84,7 @@ module Guillotine
       end
 
       begin
-        if code = @db.add(url.to_s, code)
+        if code = @db.add(url.to_s, code, @options)
           [201, {"Location" => code}]
         else
           [422, {}, "Unable to shorten #{url}"]
@@ -64,7 +104,7 @@ module Guillotine
       if url.scheme !~ /^https?$/
         [422, {}, "Invalid url: #{url}"]
       else
-        @host_check.call url
+        @options.host_checker.call url
       end
     end
 
@@ -77,11 +117,18 @@ module Guillotine
       if str.respond_to?(:scheme)
         str
       else
-        str = str.to_s
-        str.gsub! /\s/, ''
-        str.gsub! /(\#|\?).*/, ''
-        Addressable::URI.parse str
+        parse_url(str.to_s)
       end
     end
+
+    # Internal
+    def parse_url(url)
+      @db.parse_url(url, @options)
+    end
+
+    # Public
+    def default_url
+      @options.default_url
+    end
   end
 end

data/test/app_test.rb

@@ -10,7 +10,7 @@ module Guillotine
 
     def test_adding_a_link_returns_code
       url = 'http://github.com'
-      post '/', :url => url + '?a=1'
+      post '/', :url => url
       assert_equal 201, last_response.status
       assert code_url = last_response.headers['Location']
       code = code_url.gsub(/.*\//, '')
@@ -20,6 +20,60 @@ module Guillotine
       assert_equal url, last_response.headers['Location']
     end
 
+    def test_adding_a_link_with_query_params_strips_query
+      query_url = 'http://github.com?a=1'
+      url = 'http://github.com'
+      post '/', :url => query_url
+      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_a_link_with_query_params_returns_code
+      with_service :strip_query => false do
+        url = 'http://github.com?a=1'
+        post '/', :url => url
+        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
+    end
+
+    def test_adding_a_link_with_anchor_strips_anchor
+      query_url = 'http://github.com?a=1#a'
+      url = 'http://github.com'
+      post '/', :url => query_url
+      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_a_link_with_anchor_params_returns_code
+      with_service :strip_anchor => false do
+        url = 'http://github.com#a'
+        post '/', :url => url
+        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
+    end
+
     def test_adding_duplicate_link_returns_same_code
       url  = 'http://github.com'
       code = ADAPTER.add url
@@ -101,23 +155,41 @@ module Guillotine
     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
+      with_service /abc\.com$/ do
+        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://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
+        post '/', :url => 'http://www.abc.com/def'
+        assert_equal 201, last_response.status
+      end
+    end
+
+    def test_get_without_code_returns_default_url
+      with_service :default_url => 'http://google.com' do
+        get '/'
+        assert_equal "http://google.com", last_response.headers['location']
+      end
+    end
+
+    def test_get_without_code_no_default_url
+      get '/'
+      assert_equal nil, last_response.headers['location']
     end
 
     def app
       App
     end
+
+    def with_service(options)
+      App.set :service, Service.new(ADAPTER, options)
+      yield
+    ensure
+      App.set :service, SERVICE
+    end
   end
 end
 

data/test/cassandra_adapter_test.rb

@@ -0,0 +1,67 @@
+require File.expand_path('../helper', __FILE__)
+
+begin
+  require "rubygems"
+  require "cassandra"
+  require 'cassandra/mock'
+
+  class CassandraAdapterTest < Guillotine::TestCase
+    @test_schema = JSON.parse(File.read(File.join(File.expand_path(File.dirname(__FILE__)), '..','config', 'cassandra_config.json')))
+    @cassandra_mock = Cassandra::Mock.new('url_shortener', @test_schema)
+    @cassandra_mock.clear_keyspace!
+    ADAPTER = Guillotine::CassandraAdapter.new @cassandra_mock
+
+    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
+
+    def test_read_only
+      Guillotine::CassandraAdapter.new @cassandra_mock, true
+      code = @db.add 'abc'
+      assert_equal nil, code
+    end
+  end
+
+rescue LoadError
+  puts "Skipping Cassandra tests: #{$!}"
+end

data/test/helper.rb

@@ -3,4 +3,7 @@ require File.expand_path('../../lib/guillotine', __FILE__)
 require 'rack/test'
 
 class Guillotine::TestCase < Test::Unit::TestCase
+  def default_test
+  end
 end
+

data/test/options_test.rb

@@ -0,0 +1,59 @@
+require File.expand_path('../helper', __FILE__)
+
+module Guillotine
+  class OptionsTest < TestCase
+    def test_parses_from_options
+      options = Service::Options.new
+      assert_equal options.object_id, Service::Options.from(options).object_id
+    end
+
+    def test_parses_from_string
+      options = Service::Options.from('abc')
+      assert_equal 'abc', options.required_host
+      assert options.strip_query?
+      assert options.strip_anchor?
+    end
+
+    def test_parses_from_regex
+      options = Service::Options.from(/abc/)
+      assert_equal /abc/, options.required_host
+      assert options.strip_query?
+      assert options.strip_anchor?
+    end
+
+    def test_parses_from_hash
+      options = Service::Options.from(:strip_query => true,
+        :strip_anchor => false)
+      assert_nil options.required_host
+      assert options.strip_query?
+      assert !options.strip_anchor?
+    end
+
+    def test_parses_from_bad_hash
+      assert_raises NameError do
+        Service::Options.from :foo => 1
+      end
+    end
+
+    def test_parses_from_unknown
+      assert_raises ArgumentError do
+        Service::Options.from 123
+      end
+    end
+
+    def test_parses_from_empty_string
+      options = Service::Options.from('')
+      assert_nil options.required_host
+      assert options.strip_query?
+      assert options.strip_anchor?
+    end
+
+    def test_parses_from_nil
+      options = Service::Options.from(nil)
+      assert_nil options.required_host
+      assert options.strip_query?
+      assert options.strip_anchor?
+    end
+  end
+end
+

data/test/service_test.rb

@@ -9,7 +9,19 @@ module Guillotine
 
     def test_adding_a_link_returns_code
       url = 'http://github.com'
-      status, head, body = @service.create(url + '?a=1')
+      status, head, body = @service.create(url)
+      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_a_link_with_query_param_returns_code
+      url = 'http://github.com?a=1'
+      status, head, body = @service.create(url)
       assert_equal 201, status
       assert code_url = head['Location']
       code = code_url.gsub(/.*\//, '')
@@ -110,6 +122,23 @@ module Guillotine
       status, head, body = service.create('http://www.abc.com/def')
       assert_equal 201, status
     end
+
+    def test_fixed_charset_code
+      @db = MemoryAdapter.new
+      length = 4
+      char_set = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z']
+      @service = Service.new @db, :length => length, :charset => char_set
+
+      url = 'http://github.com'
+      status, head, body = @service.create(url)
+      assert_equal 201, status
+      assert code_url = head['Location']
+
+      assert_equal 4, code_url.length
+      code_url.each_char do |c|
+        assert char_set.include?(c)
+      end
+    end
   end
 end
 

metadata

@@ -1,64 +1,82 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: guillotine
-version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
-authors:
+authors: 
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &70118903831360 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+
+date: 2012-08-19 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 6
         version: 1.2.6
-  type: :runtime
+  name: sinatra
+  requirement: *id001
   prerelease: false
-  version_requirements: *70118903831360
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: &70118903830900 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 6
         version: 2.2.6
-  type: :runtime
+  name: addressable
+  requirement: *id002
   prerelease: false
-  version_requirements: *70118903830900
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &70118903830520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  name: rack-test
+  requirement: *id003
   prerelease: false
-  version_requirements: *70118903830520
 description: Adaptable private URL shortener
 email: technoweenie@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- config/cassandra_config.json
 - config/haproxy.riak.cfg
 - guillotine.gemspec
 - lib/guillotine.rb
 - lib/guillotine/adapters/active_record_adapter.rb
+- lib/guillotine/adapters/cassandra_adapter.rb
 - lib/guillotine/adapters/memory_adapter.rb
 - lib/guillotine/adapters/mongo_adapter.rb
 - lib/guillotine/adapters/redis_adapter.rb
@@ -70,44 +88,54 @@ files:
 - script/cibuild
 - test/active_record_adapter_test.rb
 - test/app_test.rb
+- test/cassandra_adapter_test.rb
 - test/helper.rb
 - test/host_checker_test.rb
 - test/memory_adapter_test.rb
 - test/mongo_adapter_test.rb
+- test/options_test.rb
 - test/redis_adapter_test.rb
 - test/riak_adapter_test.rb
 - test/sequel_adapter_test.rb
 - test/service_test.rb
+has_rdoc: true
 homepage: https://github.com/technoweenie/gitio
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: guillotine
-rubygems_version: 1.8.11
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Adaptable private URL shortener
-test_files:
+test_files: 
 - test/active_record_adapter_test.rb
 - test/app_test.rb
+- test/cassandra_adapter_test.rb
 - test/host_checker_test.rb
 - test/memory_adapter_test.rb
 - test/mongo_adapter_test.rb
+- test/options_test.rb
 - test/redis_adapter_test.rb
 - test/riak_adapter_test.rb
 - test/sequel_adapter_test.rb