tokyo_cache_cow 0.0.9 → 0.0.10

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 9
+:patch: 10
 :major: 0
 :build: 
 :minor: 0

data/lib/tokyo_cache_cow/runner.rb

@@ -41,7 +41,7 @@ class TokyoCacheCow
         end
 
         opts.on("-c[OPTIONAL]", "--class", "Cache provider class (default: #{options[:class]})") do |v|
-          options[:provider] = v
+          options[:class] = v
         end
 
         opts.on("-r[OPTIONAL]", "--require", "require") do |v|
@@ -90,7 +90,7 @@ class TokyoCacheCow
       puts "Starting the tokyo cache cow #{address} #{port}"
       pid = EM.fork_reactor do
         cache = clazz.new(:file => @options[:file])
-        cache.marshalling_enabled = 
+        cache.marshalling_enabled = options[:marshalling]
         trap("INT") { EM.stop; puts "\nmoooooooo ya later"; exit(0)}
         EM.run do
           EM.start_server(address, port, TokyoCacheCow::Server) do |c|

data/lib/tokyo_cache_cow/server.rb

@@ -170,23 +170,26 @@ class TokyoCacheCow
           when 'cas'
             # do something
           when 'delete'
-            case args
-            when DeleteWithTimeoutCommand
-              (key, timeout, noreply) = [$1.chomp, $2, !$3.nil?]
-              next unless validate_key(key)
+            split_args = args.split(/\s+/)
+            (key, timeout, noreply) = case split_args.size
+            when 2
+              [split_args[0].chomp, 0, !split_args[1].nil?]
+            when 3
+              [split_args[0].chomp, split_args[1].to_i, !split_args[2].nil?]
+            else
+              (send_client_error and next)
+            end
+            next unless validate_key(key)
+            if special_match_char && key.index(special_match_char) == 0
+              key.slice!(0,special_match_char.size)
+              @cache.delete_match(key)
+              send_data(DeletedReply)
+            elsif timeout == 0
+              send_data @cache.delete(key) ?
+                DeletedReply : NotDeletedReply
+            else
               send_data(@cache.delete_expire(key, timeout) ?
                 DeletedReply : NotDeletedReply)
-            when DeleteCommand
-              (key, noreply) = [$1.chomp, !$2.nil?]
-              next unless validate_key(key)
-              if special_match_char && key.index(special_match_char) == 0
-                key.slice!(0,special_match_char.size)
-                @cache.delete_match(key)
-                send_data(DeletedReply)
-              else
-                send_data @cache.delete(key) ?
-                  DeletedReply : NotDeletedReply
-              end
             end
           when 'delete_match'
             DeleteMatchCommand.match(args)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Joshua Hull
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -04:00
+date: 2010-04-12 00:00:00 -04:00
 default_executable: tokyo_cache_cow
 dependencies: 
 - !ruby/object:Gem::Dependency