webs 0.1.36 → 0.1.37

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('webs', '0.1.36') do |p|
+Echoe.new('webs', '0.1.37') do |p|
   p.description    = "Reusable webs stuff."
   p.url            = "https://colczak@github.com/websdev/websgem.git"
   p.author         = "Chuck Olczak"

data/lib/cache/cache.rb

@@ -5,8 +5,8 @@ module Webs
     mattr_accessor :off
     
     def cache_remove(key)
-      Rails.logger.debug "*********** cache_remove(#{key})" if debug
-      return if key.nil?
+      Rails.logger.debug "*********** cache_remove( #{key} )" if debug
+      return if key.nil? || off
       Webs.cache.delete(key.to_s)
     rescue Exception => e
       Rails.logger.error "------------------------------------------------\nmemcache_error: #{e.message}"
@@ -14,56 +14,67 @@ module Webs
     end
 
     def cache_read( key )
-      Rails.logger.debug "*********** cache_read(#{key})" if debug
-      if Webs.cache.respond_to?( 'read' )
-        Webs.cache.read(key)
-      else
-        Webs.cache[ key ]
-      end
+      return nil if off
+      data = Webs.cache.respond_to?( 'read' ) ? Webs.cache.read(key.to_s) : Webs.cache[ key.to_s ]
+      Rails.logger.debug "****#{data ? 'HIT*' : 'MISS'}*** cache_read( #{key} )" if debug
+      data
       rescue Exception => e
         Rails.logger.error "------------------------------------------------\nmemcache_error: #{e.message}, #{e.backtrace.join("\n")}"
         nil
     end
-
-    def cache_block(key, options=nil, &block)
-      return if key.nil?
-      if off
-        if self.respond_to?('capture')
-          data = capture(&block) # called from view
+    
+    def cache_write( key, data, options={} )
+      s_data = Marshal.dump(data)
+      block_size = s_data.size
+      #TODO: Compression?
+      if block_size < 1.megabyte
+        Rails.logger.debug "*********** cache_write[#{block_size}]( #{key}, #{data && data.inspect.length > 100 ? data.inspect[0..100] : data} )" if debug
+        if Webs.cache.respond_to?( 'write' )
+          Webs.cache.write(key.to_s, data)
         else
-          data = yield
+          Webs.cache[ key.to_s ] = data
         end
-        Rails.logger.debug "****OFF**** cache_block(#{key})" if debug
-        return data
+      else
+        Rails.logger.debug "*********** cache_write( #{key} ) not cached since exceeds 1M @ #{block_size} )" if debug 
       end
-      
+    rescue Exception => e
+      Rails.logger.error "------------------------------------------------\nmemcache_error: #{e.message}, #{e.backtrace.join("\n")}"
+      nil
+    end
+
+    def get_data( &block )
+      self.respond_to?('capture') ? capture(&block) : yield
+    end
+
+    def cache_block(key, options={}, &block)
+      return if key.nil?
+      Rails.logger.debug "*********** cache_block( #{key} )" if debug
+      return get_data( &block ) if off
+     
       unless ( data=cache_read(key) )
-        if self.respond_to?('capture')
-          data = capture(&block) # called from view
-        else
-          data = yield
-        end
-        s_data = Marshal.dump(data)
-        block_size = s_data.size
-        #TODO: Check to see if dalli cache & compressed then up the size to 3MB
-        # should get almost 10:1 compression ratio. This will be key for caching pages & fragments
-        if block_size < 1.megabyte
-          Rails.logger.debug "*********** cache_block[#{block_size}](#{key}, #{data && data.inspect.length > 100 ? data.inspect[0..100] : data} )" if debug
-          if Webs.cache.respond_to?( 'write' )
-            Webs.cache.write(key, data)
-          else
-            Webs.cache[ key ] = data
-          end
-        else
-          Rails.logger.debug "*********** cache_block(#{key}) not cached since exceeds 3M @ #{block_size} )" if debug 
-        end
-      else
-        Rails.logger.debug "****HIT**** cache_block(#{key} )" if debug && !off
+        # if self responds to capture this is called from a view which means we can cache snippets
+        data = get_data( &block )
+        cache_write( key.to_s, data, options )
       end
       data
     rescue Exception => e
       Rails.logger.error "------------------------------------------------\nmemcache_error: #{e.message}, #{e.backtrace.join("\n")}"
       data
     end
+
+    
+    # caching snippets works very similiarly to caching a block except that snippets have already
+    # been read to check for existence so we don't want to do a re-read.  So generally in the controller
+    # you will do a cache_read on the key, setting a snippet @var, not do normal processing, then in view
+    # do a cache_snippet which checks to see if snippet param is set if not it will cache_block the snippet
+    # view otherwide just render the passed snippet
+    def cache_snippet(snippet, key, options={}, &block)
+      return snippet.html_safe if !snippet.blank?
+      if options.delete(:ignore_cache)
+        get_data( &block )
+      else
+        cache_block( key, options, &block )
+      end
+    end
   end
 end

data/lib/controller/webs_controller.rb

@@ -144,7 +144,10 @@ module Webs
       
       # Usefull for debugging, set FW_PARAMS in development.rb and you can see the raw html in a browser
       def set_fw_params
-        params.merge!( FW_PARAMS ) if defined?( FW_PARAMS )
+        if defined?( FW_PARAMS )
+          params.merge!( FW_PARAMS ) 
+          Rails.logger.debug "************ set_fw_params PARAMS=#{params.inspect}"
+        end
       end
       
       # NOTE: bots & perl scripts are getting bad format in the request headers

data/lib/webs.rb

@@ -7,7 +7,7 @@ require dir + 'helper/params'
 require dir + 'helper/tags'
 
 module Webs
-  VERSION = '0.1.36'.freeze
+  VERSION = '0.1.37'.freeze
 
   def self.app_title
     APP_NAME.titleize

data/webs.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webs}
-  s.version = "0.1.36"
+  s.version = "0.1.37"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Olczak"]
-  s.date = %q{2011-05-09}
+  s.date = %q{2011-06-01}
   s.description = %q{Reusable webs stuff.}
   s.email = %q{chuck@webs.com}
   gemfiles = [

metadata

@@ -2,7 +2,7 @@
 name: webs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors: 
 - Chuck Olczak
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 -04:00
+date: 2011-06-01 00:00:00 -04:00
 default_executable: 
 dependencies: []