cachetastic 1.2.7.1 → 1.3.0

data/lib/adapters/cachetastic_adapters_file.rb

@@ -71,15 +71,7 @@ class Cachetastic::Adapters::File < Cachetastic::Adapters::Base
   def get_key_directoy(key, mkdir = true)
     hkey = self.hashed_keys[key.to_sym]
     if hkey.nil?
-      hkey = key.to_s.hexdigest.hash
-      hkey = hkey * -1 if hkey < 0
-      hkey = hkey.to_s
-      i = 0
-      path = self.directory
-      until i == hkey.length do
-        path = File.join(path, hkey[i..i])
-        i += 1
-      end
+      path = File.join(self.directory, Cachetastic::Helpers::FileUtils.directory_from_key(key))
       self.hashed_keys[key.to_sym] = path
       hkey = path
     end

data/lib/adapters/cachetastic_adapters_html_file.rb

@@ -74,15 +74,7 @@ class Cachetastic::Adapters::HtmlFile < Cachetastic::Adapters::Base
   def get_key_directoy(key, mkdir = true)
     hkey = self.hashed_keys[key.to_sym]
     if hkey.nil?
-      hkey = key.to_s.hexdigest.hash
-      hkey = hkey * -1 if hkey < 0
-      hkey = hkey.to_s
-      i = 0
-      path = self.directory
-      until i == hkey.length do
-        path = File.join(path, hkey[i..i])
-        i += 1
-      end
+      path = File.join(self.directory, Cachetastic::Helpers::FileUtils.directory_from_key(key))
       self.hashed_keys[key.to_sym] = path
       hkey = path
     end
@@ -109,9 +101,9 @@ class Cachetastic::Adapters::HtmlFile < Cachetastic::Adapters::Base
   end
   
   def store_object_to_html(so)
-    x = "<!-- cachetastic: expires_at: #{so.expires_at} -->\n"
-    x << "<!-- cachetastic: key: #{so.key} -->\n"
-    x << so.value
+    x = so.value
+    x << "\n<!-- cachetastic: expires_at: #{so.expires_at} -->"
+    x << "\n<!-- cachetastic: key: #{so.key} -->"
   end
   
   STORE_FILE_NAME = "index.html"

data/lib/cachetastic.rb

@@ -31,6 +31,7 @@ require 'caches/cachetastic_caches_page_cache'
 require 'caches/cachetastic_caches_rails_session_cache'
 require 'caches/cachetastic_caches_mack_session_cache'
 require 'errors/cachetastic_errors_unsupported_adapter'
+require 'helpers/cachetastic_helpers_file_utils'
 require 'adapters/cachetastic_adapters_base'
 require 'adapters/cachetastic_adapters_store_object'
 require 'adapters/cachetastic_adapters_memcache'

data/lib/helpers/cachetastic_helpers_file_utils.rb

@@ -0,0 +1,22 @@
+require 'digest/md5'
+require 'base64'
+
+module Cachetastic
+  module Helpers
+    module FileUtils
+      
+      def self.directory_from_key(key)
+        hkey = Base64.encode64(Digest::MD5.digest(key))
+        hkey.gsub!("==\n", "")
+        i = 0
+        path = ""
+        until i >= hkey.length do
+          path = File.join(path, hkey[i..i+2])
+          i += 3
+        end
+        path
+      end
+      
+    end # FileUtils
+  end # Helpers
+end # Cachetastic

data/lib/tasks/rubyforge_config.yml

@@ -2,4 +2,4 @@
 gem_name: cachetastic
 package: cachetastic
 project: magrathea
-version: 1.2.7.1
+version: 1.3.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cachetastic
 version: !ruby/object:Gem::Version 
-  version: 1.2.7.1
+  version: 1.3.0
 platform: ruby
 authors: 
 - markbates
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-18 00:00:00 -05:00
+date: 2008-02-27 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -40,6 +40,7 @@ files:
 - lib/cachetastic_logger.rb
 - lib/errors/cachetastic_errors_unsupported_adapter.rb
 - lib/helpers/cachetastic_helpers_active_record.rb
+- lib/helpers/cachetastic_helpers_file_utils.rb
 - lib/rails_extensions/cachetastic_active_record_base.rb
 - lib/rails_extensions/cgi_session_cachetastic_store.rb
 - lib/tasks/rubyforge_config.yml