guillotine 1.3.0 → 1.4.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           = '1.3.0'
-  s.date              = '2012-08-19'
+  s.version           = '1.4.0'
+  s.date              = '2012-12-30'
   s.rubyforge_project = 'guillotine'
 
   ## Make sure your summary is short. The description may be as long

data/lib/guillotine.rb

@@ -3,7 +3,7 @@ require 'digest/md5'
 require 'addressable/uri'
 
 module Guillotine
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 
   class Error < StandardError
   end

data/lib/guillotine/adapters/active_record_adapter.rb

@@ -60,6 +60,15 @@ module Guillotine
       Url.where(:url => url).delete_all
     end
 
+    # Public: Removes the assigned short code.
+    #
+    # code - The String code to remove.
+    #
+    # Returns nothing.
+    def clear_code(code)
+      Url.where(:code => code).delete_all
+    end
+
     def setup
       conn = Url.connection
       conn.create_table :urls do |t|

data/lib/guillotine/adapters/cassandra_adapter.rb

@@ -59,9 +59,24 @@ module Guillotine
     # Returns nothing.
     def clear(url)
       if code = code_for(url)
-        @cassandra.remove("urls", url)
-        @cassandra.remove("codes", code)
+        purge(code, url)
       end
     end
+
+    # Public: Removes the assigned short code.
+    #
+    # code - The String code to remove.
+    #
+    # Returns nothing.
+    def clear_code(url)
+      if url = find(code)
+        purge(code, url)
+      end
+    end
+
+    def purge(code, url)
+      @cassandra.remove("urls", url)
+      @cassandra.remove("codes", code)
+    end
   end
 end

data/lib/guillotine/adapters/memory_adapter.rb

@@ -58,6 +58,17 @@ module Guillotine
       end
     end
 
+    # Public: Removes the assigned short code.
+    #
+    # code - The String code to remove.
+    #
+    # Returns nothing.
+    def clear_code(code)
+      if url = @hash.delete(code)
+        @urls.delete(url)
+      end
+    end
+
     def reset
       @hash = {}
       @urls = {}

data/lib/guillotine/adapters/mongo_adapter.rb

@@ -53,6 +53,15 @@ module Guillotine
       @collection.remove(:url => url)
     end
 
+    # Public: Removes the assigned short code.
+    #
+    # code - The String code to remove.
+    #
+    # Returns nothing.
+    def clear_code(code)
+      @collection.remove(:_id => code)
+    end
+
     def select(field, query)
       @collection.find_one(query, {:transformer => @transformers[field]})
     end

data/lib/guillotine/adapters/redis_adapter.rb

@@ -55,11 +55,26 @@ module Guillotine
     # Returns nothing.
     def clear(url)
       if code = @redis.get(url_key(url))
-        @redis.del url_key(url)
-        @redis.del code_key(code)
+        purge(code, url)
       end
     end
 
+    # Public: Removes the assigned short code.
+    #
+    # code - The String code to remove.
+    #
+    # Returns nothing.
+    def clear_code(code)
+      if url = find(code)
+        purge(code, url)
+      end
+    end
+
+    def purge(code, url)
+      @redis.del url_key(url)
+      @redis.del code_key(code)
+    end
+
     def code_key(code)
       "guillotine:hash:#{code}"
     end

data/lib/guillotine/adapters/riak_adapter.rb

@@ -84,6 +84,18 @@ module Guillotine
       end
     end
 
+    # Public: Removes the assigned short code.
+    #
+    # code - The String code to remove.
+    #
+    # Returns nothing.
+    def clear_code(code)
+      if url_obj = url_object(code)
+        @url_bucket.delete url_key(url_obj.data)
+        @code_bucket.delete url_obj.key
+      end
+    end
+
     # Retrieves a URL riak value from the code.
     #
     # code - The String code to lookup the URL.

data/lib/guillotine/adapters/sequel_adapter.rb

@@ -58,6 +58,15 @@ module Guillotine
       @table.where(:url => url).delete
     end
 
+    # Public: Removes the assigned short code.
+    #
+    # code - The String code to remove.
+    #
+    # Returns nothing.
+    def clear_code(code)
+      @table.where(:code => code).delete
+    end
+
     def setup
       @db.create_table :urls do
         String :url

data/lib/guillotine/service.rb

@@ -85,7 +85,7 @@ module Guillotine
 
       begin
         if code = @db.add(url.to_s, code, @options)
-          [201, {"Location" => code}]
+          [201, {"Location" => code}, url]
         else
           [422, {}, "Unable to shorten #{url}"]
         end

metadata

@@ -1,71 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: guillotine
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 0
-  version: 1.3.0
+version: !ruby/object:Gem::Version
+  version: 1.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-19 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+date: 2012-12-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.2.6
-  name: sinatra
-  requirement: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 6
-        version: 2.2.6
+      - !ruby/object:Gem::Version
+        version: 1.2.6
+- !ruby/object:Gem::Dependency
   name: addressable
-  requirement: *id002
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.6
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.6
+- !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: *id003
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adaptable private URL shortener
 email: technoweenie@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -98,37 +97,31 @@ files:
 - test/riak_adapter_test.rb
 - test/sequel_adapter_test.rb
 - test/service_test.rb
-has_rdoc: true
 homepage: https://github.com/technoweenie/gitio
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: guillotine
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: Adaptable private URL shortener
-test_files: 
+test_files:
 - test/active_record_adapter_test.rb
 - test/app_test.rb
 - test/cassandra_adapter_test.rb
@@ -140,3 +133,4 @@ test_files:
 - test/riak_adapter_test.rb
 - test/sequel_adapter_test.rb
 - test/service_test.rb
+has_rdoc: