callcache 0.1.2 → 0.2.0

data/callcache.gemspec

@@ -3,7 +3,7 @@ require 'date'
 
 SPEC = Gem::Specification.new do |s| 
   s.name = "callcache" 
-  s.version = "0.1.2" 
+  s.version = "0.2.0" 
   s.author = "Adam Wisniewski" 
   s.email = "adamw@tbcn.ca" 
   s.date = s.date = Date.today.to_s

data/lib/call_cache.rb

@@ -24,17 +24,24 @@ module CallCache
     CACHE_DIRECTORY = "/tmp/cache"
     SECONDS_TO_CACHE = 60 * 60 * 3
         
-    def CallCache.call( function_call, *parameters )
-        #CallCache.check_or_create_tmp_dir
+    def CallCache.call( function_call, hashes )
+        parameters = hashes[:pars]
+        options = hashes[:options]
         
+        ttl = SECONDS_TO_CACHE
+        if !options.nil?
+            if options[:ttl]
+                ttl = options[:ttl]
+            end
+        end
+
         cached_call = CallCache.find( function_call, *parameters )
         
-        if cached_call == nil || Time.now.to_i - cached_call.created_at.to_i > SECONDS_TO_CACHE
+        if cached_call == nil || Time.now.to_i - cached_call.created_at.to_i > ttl
             return_val = CallCache.make_call( function_call, *parameters )
             cached_call = CachedCall.new( return_val, function_call, *parameters )
             
             CallCache.save( cached_call )
-            
         end
 
         return cached_call.return_val          
@@ -46,21 +53,21 @@ module CallCache
         md5.update( Marshal.dump( parameters ) )
         return md5.hexdigest   
     end
-    
+
     #def CallCache.check_or_create_tmp_dir
     #    file_path = CallCache::CACHE_DIRECTORY + File::SEPARATOR + "call_cache_" + id_string
     #end
-    
+
     def CallCache.file_path_for( function_call, *parameters )
         CallCache::CACHE_DIRECTORY + File::SEPARATOR + 
                         "call_cache_" + CallCache.get_id_for( function_call, *parameters )
     end
-    
+
     def CallCache.find( function_call, *parameters )
         cached_call = nil
-        
+
         file_path = CallCache.file_path_for(function_call, *parameters)
-        
+
         if File.exist?( file_path )
             # return saved cached result
             cached_call = Marshal.load( File.read( file_path ) )
@@ -68,30 +75,29 @@ module CallCache
 
         return cached_call
     end
-    
+
     def CallCache.save( cached_call )
         # write call to cache location
-        
+
         if !File.directory?( CallCache::CACHE_DIRECTORY )
             Dir.mkdir( CallCache::CACHE_DIRECTORY )
         end
-        
+
         file_path = CallCache.file_path_for( cached_call.function_call, *cached_call.parameters )
         dest_file = File.new( file_path, 'wb' )
         dest_file.write( Marshal.dump( cached_call ) )
         dest_file.close
-      
+
     end
-    
+
     def CallCache.make_call( function_call, *parameters )
-      
-        # call function
-        # parse call to handle local methods or static class methods 
-        function_call.gsub!( '::', '.' )
-        function_call_split = function_call.split(/\./)
-        # make the call
-        
-        return_val = eval( function_call_split[0..-2].join('::') ).method( function_call_split[-1] ).call( *parameters )          
+          # call function
+          # parse call to handle local methods or static class methods 
+          function_call.gsub!( '::', '.' )
+          function_call_split = function_call.split(/\./)
+          # make the call
 
-    end
+          return_val = eval( function_call_split[0..-2].join('::') ).method( function_call_split[-1] ).call( *parameters )          
+
+      end
 end

data/lib/main.rb

@@ -31,5 +31,7 @@ def exp_fun( start_num, end_num )
 end
 
 
-p CallCache.call( 'exp_fun', 1, 10000 )
-p CallCache.call( 'Net::HTTP.get', URI.parse('http://www.google.com') );
+blog_source = CallCache.call( 'Net::HTTP.get', :pars => [URI.parse('http://feeds.feedburner.com/adamw523?format=xml')] );
+
+p blog_source.size
+p CallCache.call( 'exp_fun', :pars => [1, 10000], :options => {:ttl => 10})

data/nbproject/private/private.xml

@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
+        <file>file:/Users/adam/work/callcache/callcache/callcache.gemspec</file>
+        <file>file:/Users/adam/work/callcache/callcache/lib/call_cache.rb</file>
+        <file>file:/Users/adam/work/callcache/callcache/lib/main.rb</file>
+    </open-files>
 </project-private>

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: callcache
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 date: 2007-03-03 00:00:00 -05:00
 summary: Ruby library for caching results of a function call
 require_paths: 
@@ -29,7 +29,6 @@ post_install_message:
 authors: 
 - Adam Wisniewski
 files: 
-- callcache-0.1.2.gem
 - callcache.gemspec
 - lib
 - nbproject