tokyo_cache_cow 0.0.6 → 0.0.7

data/README.rdoc

@@ -62,7 +62,7 @@ But <i>other_key</i> is still peachy.
 
 === Aggregate functions
 
-You can invoke aggregates by using the prefixes <tt>average-</tt>, <tt>count-</tt>, <tt>sum-</tt>, <tt>min-</tt> and <tt>max-</tt>.
+You can invoke aggregates by using the functions <tt>avg()</tt>, <tt>count()</tt>, <tt>sum()</tt>, <tt>min()</tt> and <tt>max()</tt>.
 
   >> Rails.cache.write('hello1', '1')
   => true
@@ -70,9 +70,9 @@ You can invoke aggregates by using the prefixes <tt>average-</tt>, <tt>count-</t
   => true
   >> Rails.cache.write('hello3', '3')
   => true
-  >> Rails.cache.read('average-hello')
+  >> Rails.cache.read('avg(hello)')
   => "2.0"
-  >> Rails.cache.read('sum-hello')
+  >> Rails.cache.read('sum(hello)')
   => "6.0"
 
 

data/Rakefile

@@ -11,6 +11,7 @@ begin
     s.authors = ["Joshua Hull"]
     s.files = FileList["[A-Z]*", "{lib,spec,rails,bin}/**/*"]
     s.executables = ['tokyo_cache_cow']
+    s.add_dependency 'eventmachine'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:major: 0
 :build: 
+:major: 0
 :minor: 0
-:patch: 6
+:patch: 7

data/lib/tokyo_cache_cow/cache.rb

@@ -1,11 +1,9 @@
-$:.unshift(File.dirname(__FILE__))
-
 class TokyoCacheCow
   class Cache
-    self.autoload :Base, 'cache/base'
-    self.autoload :FileMemcache, 'cache/file_memcache'
-    self.autoload :TokyoCabinetMemcache, 'cache/tokyo_cabinet_memcache'
-    self.autoload :HashMemcache, 'cache/hash_memcache'
+    self.autoload :Base,                 File.join('tokyo_cache_cow', 'cache', 'base')
+    self.autoload :FileMemcache,         File.join('tokyo_cache_cow', 'cache', 'file_memcache')
+    self.autoload :TokyoCabinetMemcache, File.join('tokyo_cache_cow', 'cache', 'tokyo_cabinet_memcache')
+    self.autoload :HashMemcache,         File.join('tokyo_cache_cow', 'cache', 'hash_memcache')
   end
 end
 

data/lib/tokyo_cache_cow/cache/base.rb

@@ -2,6 +2,16 @@ class TokyoCacheCow
   class Cache
     class Base
       
+      attr_accessor :marshalling_enabled
+      
+      def marshal(val)
+        marshalling_enabled ? Marshal.dump(val) : val
+      end
+      
+      def unmarshal(val)
+        marshalling_enabled ? Marshal.load(val) : val
+      end
+      
       def process_time(time)
         time = case time
         when 0, nil: 0
@@ -9,35 +19,35 @@ class TokyoCacheCow
         else time
         end
       end
-      
-      def average_match(match)
+
+      def avg_match(match)
         values = numeric_values_match(match)
-        values.inject(0.0) { |sum, el| sum + el } / values.size
+        marshal(values.inject(0.0) { |sum, el| sum + el } / values.size)
       end
       
       def sum_match(match)
         values = numeric_values_match(match)
-        values.inject(0.0) { |sum, el| sum + el }
+        marshal(values.inject(0.0) { |sum, el| sum + el })
       end
       
       def count_match(match)
         values = numeric_values_match(match)
-        values.size
+        marshal(values.size)
       end
       
       def min_match(match)
         values = numeric_values_match(match)
-        values.min
+        marshal(values.min)
       end
       
       def max_match(match)
         values = numeric_values_match(match)
-        values.max
+        marshal(values.max)
       end
       
       def numeric_values_match(match)
         numeric_keys = get_match(match)
-        numeric_keys.map{|ak| get(ak)}.map{|v| Integer(v[:value]) rescue nil}.compact
+        numeric_keys.map{|ak| get(ak)}.map{|v| Integer(unmarshal(v[:value])) rescue nil}.compact
       end
       
     end

data/lib/tokyo_cache_cow/cache/file_memcache.rb

@@ -88,12 +88,12 @@ class TokyoCacheCow
       end
       
       def get_raw(key)
-        File.exists?(path_for_key(key)) ? YAML::load( File.open( path_for_key(key) ) ) : nil
+        File.exists?(path_for_key(key)) ? unmarshal(YAML::load( File.open( path_for_key(key)))) : nil
       end
       
       def set_raw(key, data)
         File.open(path_for_key(key), 'w') do |out|
-          YAML.dump(data, out)
+          YAML.dump(data, marshal(out))
         end
       end
       

data/lib/tokyo_cache_cow/cache/tokyo_cabinet_memcache.rb

@@ -28,7 +28,7 @@ class TokyoCacheCow
             delete(key)
             nil
           else
-            { :value => data['value'], :expires => expires, :flags => flags }
+            { :value => unmarshal(data['value']), :expires => expires, :flags => flags }
           end
         end 
       end
@@ -68,7 +68,7 @@ class TokyoCacheCow
       def generate_data_hash(value, options)
         expires = options[:expires] && options[:expires].to_s || '0'
         flags = options[:flags] && options[:flags].to_s || '0'
-        { 'value' => value, 'expires' => process_time(expires), 'flags' => flags }
+        { 'value' => marshal(value), 'expires' => process_time(expires), 'flags' => flags }
       end
     
       def time_expired?(time)

data/lib/tokyo_cache_cow/runner.rb

@@ -18,7 +18,8 @@ class TokyoCacheCow
         :file                  => '/tmp/tcc-cache',
         :pid                   => '/tmp/tcc.pid',
         :special_delete_prefix => nil,
-        :daemonize             => false
+        :daemonize             => false,
+        :marshalling           => true
       }
       
       parse!
@@ -56,13 +57,17 @@ class TokyoCacheCow
         end
 
         opts.on("-P[OPTIONAL]", "--pid", "Pid file (default: #{options[:pid]})") do |v|
-          options[:pid] = true
+          options[:pid] = v
         end
 
         opts.on("-m[OPTIONAL]", "--matcher", "Special flag for doing matched deletes (not enabled by default)") do |v|
           options[:special_delete_char] = v
         end
 
+        opts.on("-M[=OPTIONAL]", "--marshalling", "Disable marshalling of values") do |v|
+          options[:marshalling] = false
+        end
+
         opts.on_tail("-h", "--help", "Show this help message.") { puts opts; exit }
 
       end
@@ -79,13 +84,13 @@ class TokyoCacheCow
         parent.const_get(mod)
       end
       
-      
       address = @options[:address]
       port = @options[:port]
       special_delete_char = @options[:special_delete_char]
       puts "Starting the tokyo cache cow #{address} #{port}"
       pid = EM.fork_reactor do
         cache = clazz.new(:file => @options[:file])
+        cache.marshalling_enabled = 
         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

@@ -101,10 +101,10 @@ class TokyoCacheCow
             keys = args.split(/\s+/)
             keys.each do |k|
               next unless validate_key(k)
-              if k =~ /^(average|sum|count|min|max)-(.*)/
-                average = @cache.send(:"#{$1}_match", $2).to_s
-                send_data(GetValueReply % [k, "0", average.size])
-                send_data(average)
+              if k =~ /^(avg|sum|count|min|max)\((.*?)\)$/
+                value = @cache.send(:"#{$1}_match", $2).to_s
+                send_data(GetValueReply % [k, "0", value.size])
+                send_data(value)
                 send_data(Terminator)
               else
                 if data = @cache.get(k)

data/spec/cache_spec.rb

@@ -26,7 +26,7 @@ require 'lib/tokyo_cache_cow/cache'
       cache.set("session1-value3","13")
       cache.set("session1-value4","10")
       cache.set("session1-value5","14")
-      cache.average_match('session1').should == 12
+      cache.avg_match('session1').should == 12
     end
 
     it "should put & get" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tokyo_cache_cow
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 -05:00
+date: 2010-03-17 00:00:00 -04:00
 default_executable: tokyo_cache_cow
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: ""
 email: joshbuddy@gmail.com
 executables: 
@@ -32,7 +41,6 @@ files:
 - lib/tokyo_cache_cow/cache/file_memcache.rb
 - lib/tokyo_cache_cow/cache/hash_memcache.rb
 - lib/tokyo_cache_cow/cache/tokyo_cabinet_memcache.rb
-- lib/tokyo_cache_cow/providers.rb
 - lib/tokyo_cache_cow/runner.rb
 - lib/tokyo_cache_cow/server.rb
 - rails/init.rb

data/lib/tokyo_cache_cow/providers.rb

@@ -1,13 +0,0 @@
-class TokyoCacheCow
-  
-  autoload :TokyoCabinetMemcache, 'lib/tokyo_cache_cow/tokyo_cabinet_memcache'
-
-  class Providers
-    
-    def self.provide_cache
-      #require 'lib/tokyo_cache_cow/tokyo_cabinet_memcache'
-      @@cache ||= TokyoCacheCow::TokyoCabinetMemcache.new('/tmp/tcc')
-    end
-    
-  end
-end