guillotine 1.0.5 → 1.0.6

data/guillotine.gemspec

@@ -13,7 +13,7 @@ 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.5'
+  s.version           = '1.0.6'
   s.date              = '2011-11-10'
   s.rubyforge_project = 'guillotine'
 

data/lib/guillotine/adapters/riak_adapter.rb

@@ -25,8 +25,8 @@ module Guillotine
       # 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)
-        sha      = url_key url
-        url_obj  = @url_bucket.get_or_new sha, :r => 1
+        sha     = url_key url
+        url_obj = @url_bucket.get_or_new sha, :r => 1
         if url_obj.raw_data
           fix_url_object(url_obj)
           code = url_obj.data
@@ -37,7 +37,7 @@ module Guillotine
         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
+          raise DuplicateCodeError.new(existing_url, url, code) if url_key(existing_url) != sha
         end
 
         if !url_obj.data # unsaved
@@ -110,7 +110,7 @@ module Guillotine
       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
+      # was 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
@@ -122,7 +122,7 @@ module Guillotine
       end
 
       def url_key(url)
-        Digest::SHA1.hexdigest url
+        Digest::SHA1.hexdigest url.downcase
       end
     end
   end

data/lib/guillotine/adapters/sequel_adapter.rb

@@ -14,8 +14,8 @@ module Guillotine
       # 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 row = @table.select(:code).where(:url => url).first
-          row[:code]
+        if existing = code_for(url)
+          existing
         else
           code ||= shorten url
           begin

data/lib/guillotine.rb

@@ -3,7 +3,7 @@ require 'digest/md5'
 require 'addressable/uri'
 
 module Guillotine
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 
   dir = File.expand_path '../guillotine', __FILE__
   autoload :App, "#{dir}/app"
@@ -51,7 +51,6 @@ module Guillotine
       # Returns an Addressable::URI.
       def parse_url(url)
         url.gsub! /\s/, ''
-        url.downcase!
         Addressable::URI.parse url
       end
     end

data/test/app_test.rb

@@ -22,7 +22,7 @@ class AppTest < Guillotine::TestCase
     url  = 'http://github.com'
     code = ADAPTER.add url
 
-    post '/', :url => url.upcase
+    post '/', :url => url
     assert code_url = last_response.headers['Location']
     assert_equal code, code_url.gsub(/.*\//, '')
   end

data/test/riak_adapter_test.rb

@@ -29,8 +29,8 @@ begin
     end
 
     def test_adding_duplicate_link_returns_same_code
-      code = @db.add 'abc'
-      assert_equal code, @db.add('abc')
+      code = @db.add 'Abc'
+      assert_equal code, @db.add('ABc')
 
       URL_BUCKET.delete Digest::SHA1.hexdigest('abc')
       CODE_BUCKET.delete code

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guillotine
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000 Z
+date: 2011-11-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70237903245740 !ruby/object:Gem::Requirement
+  requirement: &70184602702960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70237903245740
+  version_requirements: *70184602702960
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70237903244540 !ruby/object:Gem::Requirement
+  requirement: &70184602702360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70237903244540
+  version_requirements: *70184602702360
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70237903244140 !ruby/object:Gem::Requirement
+  requirement: &70184602701980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237903244140
+  version_requirements: *70184602701980
 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.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: Adaptable private URL shortener