guillotine 0.1.2 → 0.2.0

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           = '0.1.2'
-  s.date              = '2011-08-17'
+  s.version           = '0.2.0'
+  s.date              = '2011-08-18'
   s.rubyforge_project = 'guillotine'
 
   ## Make sure your summary is short. The description may be as long

data/lib/guillotine/adapters/active_record_adapter.rb

@@ -43,6 +43,26 @@ module Guillotine
         end
       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)
+        if row = Url.select(:code).where(:url => url).first
+          row[:code]
+        end
+      end
+
+      # Public: Removes the assigned short code for a URL.
+      #
+      # url - The String URL to remove.
+      #
+      # Returns nothing.
+      def clear(url)
+        Url.where(:url => url).delete
+      end
+
       def setup
         conn = Url.connection
         conn.create_table :urls do |t|

data/lib/guillotine/adapters/memory_adapter.rb

@@ -32,10 +32,30 @@ module Guillotine
       #
       # code - The String code to lookup the URL.
       #
-      # Returns the String URL.
+      # Returns the String URL, or nil if none is found.
       def find(code)
         @hash[code]
       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)
+        @urls[url]
+      end
+
+      # Public: Removes the assigned short code for a URL.
+      #
+      # url - The String URL to remove.
+      #
+      # Returns nothing.
+      def clear(url)
+        if code = @urls.delete(url)
+          @hash.delete code
+        end
+      end
     end
   end
 end

data/lib/guillotine/adapters/riak_adapter.rb

@@ -24,7 +24,7 @@ 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      = Digest::SHA1.hexdigest url
+        sha      = url_key url
         url_obj  = @url_bucket.get_or_new sha, :r => 1
         url_obj.data || begin
           code        ||= shorten url
@@ -47,12 +47,60 @@ module Guillotine
       #
       # Returns the String URL.
       def find(code)
-        if obj = @code_bucket.get(code, :r => 1)
+        if obj = url_object(code)
           obj.data
         end
+      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)
+        if obj = code_object(url)
+          obj.data
+        end
+      end
+
+      # Public: Removes the assigned short code for a URL.
+      #
+      # url - The String URL to remove.
+      #
+      # Returns nothing.
+      def clear(url)
+        if code_obj = code_object(url)
+          @url_bucket.delete  code_obj.key
+          @code_bucket.delete code_obj.data
+        end
+      end
+
+      # Retrieves a URL riak value from the code.
+      #
+      # code - The String code to lookup the URL.
+      #
+      # Returns a Riak::RObject, or nil if none is found.
+      def url_object(code)
+        @code_bucket.get(code, :r => 1)
+      rescue Riak::FailedRequest => err
+        raise unless err.not_found?
+      end
+
+      # Retrieves the code riak value for a given URL.
+      #
+      # url - The String URL to lookup.
+      #
+      # Returns a Riak::RObject, or nil if none is found.
+      def code_object(url)
+        sha = url_key url
+        @url_bucket.get(sha, :r => 1)
       rescue Riak::FailedRequest => err
         raise unless err.not_found?
       end
+
+      def url_key(url)
+        Digest::SHA1.hexdigest url
+      end
     end
   end
 end

data/lib/guillotine/adapters/sequel_adapter.rb

@@ -42,6 +42,26 @@ module Guillotine
         end
       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)
+        if row = @table.select(:code).where(:url => url).first
+          row[:code]
+        end
+      end
+
+      # Public: Removes the assigned short code for a URL.
+      #
+      # url - The String URL to remove.
+      #
+      # Returns nothing.
+      def clear(url)
+        @table.where(:url => url).delete
+      end
+
       def setup
         @db.create_table :urls do
           string :url

data/lib/guillotine.rb

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

data/test/active_record_adapter_test.rb

@@ -35,6 +35,20 @@ begin
     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
   end
 rescue LoadError
   puts "skipping ActiveRecord tests: #{$!}"

data/test/memory_adapter_test.rb

@@ -30,4 +30,18 @@ class MemoryAdapterTest < Guillotine::TestCase
   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
 end

data/test/riak_adapter_test.rb

@@ -58,6 +58,29 @@ begin
     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_clears_code_for_url
+      code = @db.add 'abc'
+      assert_equal 'abc', @db.find(code)
+
+      @db.clear 'abc'
+
+      assert_nil @db.find(code)
+    end
   end
 rescue LoadError
   puts "Skipping Riak tests: #{$!}"

data/test/sequel_adapter_test.rb

@@ -35,6 +35,11 @@ begin
     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
   end
 rescue LoadError
   puts "Skipping sequel tests"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guillotine
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-17 00:00:00.000000000Z
+date: 2011-08-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70121188810040 !ruby/object:Gem::Requirement
+  requirement: &70098598402440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70121188810040
+  version_requirements: *70098598402440
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70121188809580 !ruby/object:Gem::Requirement
+  requirement: &70098598401980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70121188809580
+  version_requirements: *70098598401980
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70121188809200 !ruby/object:Gem::Requirement
+  requirement: &70098598401600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70121188809200
+  version_requirements: *70098598401600
 description: Adaptable private URL shortener
 email: technoweenie@gmail.com
 executables: []