guillotine 1.0.0 → 1.0.1

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.0'
-  s.date              = '2011-08-19'
+  s.version           = '1.0.1'
+  s.date              = '2011-09-29'
   s.rubyforge_project = 'guillotine'
 
   ## Make sure your summary is short. The description may be as long

data/lib/guillotine/adapters/riak_adapter.rb

@@ -26,19 +26,26 @@ module Guillotine
       def add(url, code = nil)
         sha      = url_key url
         url_obj  = @url_bucket.get_or_new sha, :r => 1
-        url_obj.data || begin
-          code        ||= shorten url
-          code_obj      = @code_bucket.get_or_new code
-          if existing_url = code_obj.data # key exists
-            raise DuplicateCodeError.new(existing_url, url, code) if existing_url != url
-          end
-          code_obj.content_type = url_obj.content_type = 'text/plain'
-          code_obj.data = url
-          url_obj.data  = code
-          code_obj.store
+        if url_obj.data
+          code = url_obj.data
+        end
+
+        code        ||= shorten url
+        code_obj      = @code_bucket.get_or_new code
+
+        if existing_url = code_obj.data # key exists
+          raise DuplicateCodeError.new(existing_url, url, code) if existing_url != url
+        end
+
+        if !url_obj.data # unsaved
+          url_obj.data = code
           url_obj.store
-          code
         end
+
+        code_obj.content_type = url_obj.content_type = 'text/plain'
+        code_obj.data = url
+        code_obj.store
+        code
       end
 
       # Public: Retrieves a URL from the code.

data/lib/guillotine.rb

@@ -2,7 +2,7 @@ require 'base64'
 require 'digest/md5'
 
 module Guillotine
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 
   dir = File.expand_path '../guillotine', __FILE__
   autoload :App, "#{dir}/app"

data/test/riak_adapter_test.rb

@@ -12,8 +12,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']
-    URL_BUCKET  = client['guillotine-url-test']
+    CODE_BUCKET = client["guillotine-code-test-#{Process.pid}"]
+    URL_BUCKET  = client["guillotine-url-test-#{Process.pid}"]
     ADAPTER = Guillotine::Adapters::RiakAdapter.new CODE_BUCKET, URL_BUCKET
 
     def setup
@@ -44,6 +44,22 @@ begin
       CODE_BUCKET.delete 'code'
     end
 
+    def test_adds_url_with_missing_url_key
+      url  = 'inconsistent'
+      code = "#{url}_code"
+      sha  = @db.url_key url
+      url_obj = URL_BUCKET.new sha
+      url_obj.data = code
+      url_obj.store
+
+      assert_nil @db.find(code)
+
+      added_code = @db.add url
+
+      assert_equal code, added_code
+      assert_equal url, @db.find(code)
+    end
+
     def test_clashing_urls_raises_error
       code = @db.add 'abc'
       assert_raises Guillotine::DuplicateCodeError do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guillotine
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-19 00:00:00.000000000Z
+date: 2011-09-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70113022751060 !ruby/object:Gem::Requirement
+  requirement: &70118940049540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70113022751060
+  version_requirements: *70118940049540
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70113022750600 !ruby/object:Gem::Requirement
+  requirement: &70118940049020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70113022750600
+  version_requirements: *70118940049020
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70113022750220 !ruby/object:Gem::Requirement
+  requirement: &70118940048460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113022750220
+  version_requirements: *70118940048460
 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.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: Adaptable private URL shortener