guillotine 1.0.2 → 1.0.3

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.2'
-  s.date              = '2011-10-11'
+  s.version           = '1.0.3'
+  s.date              = '2011-11-10'
   s.rubyforge_project = 'guillotine'
 
   ## Make sure your summary is short. The description may be as long

data/lib/guillotine/adapters/riak_adapter.rb

@@ -4,6 +4,7 @@ module Guillotine
   module Adapters
     # Stores shortened URLs in Riak.  Totally scales.
     class RiakAdapter < Adapter
+      PLAIN = 'text/plain'.freeze
       attr_reader :code_bucket, :url_bucket
 
       # Initializes the adapter.
@@ -27,11 +28,13 @@ module Guillotine
         sha      = url_key url
         url_obj  = @url_bucket.get_or_new sha, :r => 1
         if url_obj.data
+          fix_url_object(url_obj)
           code = url_obj.data
         end
 
-        code        ||= shorten url
-        code_obj      = @code_bucket.get_or_new code
+        code   ||= shorten url
+        code_obj = @code_bucket.get_or_new code
+        code_obj.content_type = url_obj.content_type = PLAIN
 
         if existing_url = code_obj.data # key exists
           raise DuplicateCodeError.new(existing_url, url, code) if existing_url != url
@@ -42,7 +45,6 @@ module Guillotine
           url_obj.store
         end
 
-        code_obj.content_type = url_obj.content_type = 'text/plain'
         code_obj.data = url
         code_obj.store
         code
@@ -100,11 +102,25 @@ module Guillotine
       # Returns a Riak::RObject, or nil if none is found.
       def code_object(url)
         sha = url_key url
-        @url_bucket.get(sha, :r => 1)
+        if o = @url_bucket.get(sha, :r => 1)
+          fix_url_object(o)
+        end
       rescue Riak::FailedRequest => err
         raise unless err.not_found?
       end
 
+      # Fixes a bug in Guillotine 1.0.2 where the content type on url objects
+      # were not being set.  The ruby Riak::Client defaults to JSON, so
+      # strings were being saved as "somecode", which is unparseable by JSON.
+      def fix_url_object(obj)
+        if obj.content_type != PLAIN
+          obj.content_type = PLAIN
+          obj.data = JSON.parse(%({"data":#{obj.raw_data}}))['data']
+          obj.store
+        end
+        obj
+      end
+
       def url_key(url)
         Digest::SHA1.hexdigest url
       end

data/lib/guillotine/app.rb

@@ -6,7 +6,8 @@ module Guillotine
 
     get "/:code" do
       code = params[:code]
-      if url = settings.db.find(code)
+      puts code.inspect
+      if url = settings.db.find(Addressable::URI.escape(code))
         redirect settings.db.parse_url(url).to_s
       else
         halt 404, "No url found for #{code}"

data/lib/guillotine.rb

@@ -3,7 +3,7 @@ require 'digest/md5'
 require 'addressable/uri'
 
 module Guillotine
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 
   dir = File.expand_path '../guillotine', __FILE__
   autoload :App, "#{dir}/app"

data/test/app_test.rb

@@ -38,6 +38,17 @@ class AppTest < Guillotine::TestCase
     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

data/test/riak_adapter_test.rb

@@ -37,11 +37,12 @@ begin
     end
 
     def test_adds_url_with_custom_code
-      assert_equal 'code', @db.add('def', 'code')
-      assert_equal 'def', @db.find('code')
+      code = '%E2%9C%88'
+      assert_equal code, @db.add('def', code)
+      assert_equal 'def', @db.find(code)
 
       URL_BUCKET.delete Digest::SHA1.hexdigest('def')
-      CODE_BUCKET.delete 'code'
+      CODE_BUCKET.delete code
     end
 
     def test_adds_url_with_missing_url_key
@@ -49,6 +50,7 @@ begin
       code = "#{url}_code"
       sha  = @db.url_key url
       url_obj = URL_BUCKET.new sha
+      url_obj.content_type = Guillotine::Adapters::RiakAdapter::PLAIN
       url_obj.data = code
       url_obj.store
 

data/test/sequel_adapter_test.rb

@@ -21,8 +21,9 @@ begin
     end
 
     def test_adds_url_with_custom_code
-      assert_equal 'code', @db.add('def', 'code')
-      assert_equal 'def', @db.find('code')
+      code = '%E2%9C%88'
+      assert_equal code, @db.add('def', code)
+      assert_equal 'def', @db.find(code)
     end
 
     def test_clashing_urls_raises_error

metadata

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