guillotine 0.0.3 → 0.0.4

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           = '0.0.3'
+  s.version           = '0.0.4'
   s.date              = '2011-08-17'
   s.rubyforge_project = 'guillotine'
 

data/lib/guillotine/adapters/riak_adapter.rb

@@ -4,9 +4,14 @@ module Guillotine
   module Adapters
     # Stores shortened URLs in Riak.  Totally scales.
     class RiakAdapter < Adapter
-      def initialize(bucket)
-        @bucket = bucket
-        @client = bucket.client
+      # Initializes the adapter.
+      #
+      # code_bucket - The Riak::Bucket for all code keys.
+      # url_bucket  - The Riak::Bucket for all url keys.  If this is not
+      #               given, the code bucket is used for all keys.
+      def initialize(code_bucket, url_bucket = nil)
+        @code_bucket = code_bucket
+        @url_bucket  = url_bucket || @code_bucket
       end
 
       # Public: Stores the shortened version of a URL.
@@ -18,10 +23,10 @@ module Guillotine
       # multiple times, this should return the same code.
       def add(url, code = nil)
         sha      = Digest::SHA1.hexdigest url
-        url_obj  = @bucket.get_or_new sha, :r => 1
+        url_obj  = @url_bucket.get_or_new sha, :r => 1
         url_obj.data || begin
           code        ||= shorten url
-          code_obj      = @bucket.get_or_new code
+          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
@@ -40,7 +45,7 @@ module Guillotine
       #
       # Returns the String URL.
       def find(code)
-        if obj = @bucket.get(code, :r => 1)
+        if obj = @code_bucket.get(code, :r => 1)
           obj.data
         end
       end

data/lib/guillotine.rb

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

data/test/riak_adapter_test.rb

@@ -11,8 +11,10 @@ begin
   #
   #   http://localhost:8091/riak/guillotine-test
   class RiakAdapterTest < Guillotine::TestCase
-    BUCKET  = Riak::Client.new(:http_port => 8091)['guillotine-test']
-    ADAPTER = Guillotine::Adapters::RiakAdapter.new BUCKET
+    client      = Riak::Client.new(:http_port => 8091)
+    CODE_BUCKET = client['guillotine-code-test']
+    URL_BUCKET  = client['guillotine-url-test']
+    ADAPTER = Guillotine::Adapters::RiakAdapter.new CODE_BUCKET, URL_BUCKET
 
     def setup
       @db = ADAPTER
@@ -22,24 +24,24 @@ begin
       code = @db.add 'abc'
       assert_equal 'abc', @db.find(code)
 
-      BUCKET.delete Digest::SHA1.hexdigest('abc')
-      BUCKET.delete code
+      URL_BUCKET.delete Digest::SHA1.hexdigest('abc')
+      CODE_BUCKET.delete code
     end
 
     def test_adding_duplicate_link_returns_same_code
       code = @db.add 'abc'
       assert_equal code, @db.add('abc')
 
-      BUCKET.delete Digest::SHA1.hexdigest('abc')
-      BUCKET.delete code
+      URL_BUCKET.delete Digest::SHA1.hexdigest('abc')
+      CODE_BUCKET.delete code
     end
 
     def test_adds_url_with_custom_code
       assert_equal 'code', @db.add('def', 'code')
       assert_equal 'def', @db.find('code')
 
-      BUCKET.delete Digest::SHA1.hexdigest('def')
-      BUCKET.delete 'code'
+      URL_BUCKET.delete Digest::SHA1.hexdigest('def')
+      CODE_BUCKET.delete 'code'
     end
 
     def test_clashing_urls_raises_error
@@ -48,9 +50,9 @@ begin
         @db.add 'def', code
       end
 
-      BUCKET.delete Digest::SHA1.hexdigest('abc')
-      BUCKET.delete Digest::SHA1.hexdigest('def')
-      BUCKET.delete code
+      URL_BUCKET.delete Digest::SHA1.hexdigest('abc')
+      URL_BUCKET.delete Digest::SHA1.hexdigest('def')
+      CODE_BUCKET.delete code
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guillotine
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70155812898660 !ruby/object:Gem::Requirement
+  requirement: &70097847293620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70155812898660
+  version_requirements: *70097847293620
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70155812898280 !ruby/object:Gem::Requirement
+  requirement: &70097847293240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155812898280
+  version_requirements: *70097847293240
 description: Adaptable private URL shortener
 email: technoweenie@gmail.com
 executables: []