webs 0.1.26 → 0.1.27

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('webs', '0.1.26') do |p|
+Echoe.new('webs', '0.1.27') 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

@@ -2,26 +2,39 @@ module Webs
   mattr_accessor :cache
   module Cache
     mattr_accessor :debug
+    mattr_accessor :off
     
     def cache_remove(key)
-      Rails.logger.debug "*********** cache_remove(#{key})" if debug
+      Rails.logger.debug "*********** cache_remove(#{key})" if debug && !off
       return if key.nil?
       Webs.cache.delete(key.to_s)
     rescue Exception => e
       Rails.logger.error "------------------------------------------------\nmemcache_error: #{e.message}"
       false
     end
-    
-    def cache_block(key, options=nil, &block)
-      Rails.logger.debug "*********** cache_block(#{key}, #{options.inspect if options} )" if debug
-      return if key.nil?
-      
+
+    def cache_read( key )
+      Rails.logger.debug "*********** cache_read(#{key})" if debug #&& !off
       if Webs.cache.respond_to?( 'read' )
-        data = Webs.cache.read(key)
+        Webs.cache.read(key)
       else
-        data = Webs.cache[ key ]
+        Webs.cache[ key ]
+      end
+    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
+        else
+          data = yield
+        end
+        Rails.logger.debug "****OFF**** cache_block(#{key})"
+        return data
       end
-      unless data
+      
+      unless ( data=cache_read(key) )
         if self.respond_to?('capture')
           data = capture(&block) # called from view
         else
@@ -32,17 +45,17 @@ module Webs
         #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} )" if debug
+          Rails.logger.debug "*********** cache_block[#{block_size}](#{key}, #{data && data.inspect.length > 100 ? data.inspect[0..100] : data} )" if debug && !off
           if Webs.cache.respond_to?( 'write' )
             Webs.cache.write(key, data)
           else
             Webs.cache[ key ] = data
           end
         else
-          Rails.logger.debug "*********** block not cached since exceeds 3M @ #{block_size} )" if debug
+          Rails.logger.debug "*********** cache_block(#{key}) not cached since exceeds 3M @ #{block_size} )" if debug && !off
         end
       else
-        Rails.logger.debug "****HIT**** cache_block(#{key}, #{data} )" if debug
+        Rails.logger.debug "****HIT**** cache_block(#{key} )" if debug && !off
       end
       data
     rescue Exception => e
@@ -50,4 +63,4 @@ module Webs
       data
     end
   end
-end
+end

data/lib/controller/webs_controller.rb

@@ -79,7 +79,15 @@ module Webs
         
         url = url_for( options.merge(:only_path=>true) ) if url.blank?
     
-        render_text = %(<fw:redirect url="#{url}">#{partials.collect{ |p| render_to_string :partial=>p } if partials && partials.any?}Redirecting, please wait...</fw:redirect>)
+        render_text = %[<fw:redirect url="#{url}">Redirecting, please wait...]
+        if partials && partials.any?
+          partials.each do |p| 
+            p = render_to_string( :partial=>p ) 
+            Rails.logger.debug "************ PARTIAL=> #{p}"
+            render_text += p 
+          end
+        end
+        render_text += %[</fw:redirect>]
         Rails.logger.debug render_text
         render :text => render_text
       end

data/lib/helper/application.rb

@@ -44,6 +44,35 @@ module Webs
         end
       end
 
+      # break text every col
+      def text_breaking_wrap(txt, col = 80)
+        return nil if txt.blank?
+        txt.gsub(/(.{1,#{col}})( +|$\n?)|(.{1,#{col}})/, "\\1\\3 ")
+      end
+      
+      # break text every col respecting tags
+      def html_breaking_wrap(html, col=80)
+        # Breakup the string by html tags
+        tag_regex = /<\/?[^>]*>/
+        if html && html =~ tag_regex
+          # Breakup the string by html tags
+          ss = StringScanner.new( html )
+          a = []
+          while ( ss.scan_until(tag_regex) )
+            a << ss.pre_match if !ss.pre_match.blank?
+            a << ss.matched 
+            ss = StringScanner.new( ss.rest ) 
+          end
+          a << ss.rest if ss.rest?
+          
+          # For each non-tag break long words
+          a.collect{ |s| s[0..0]=='<' ? s : text_breaking_wrap(s, col) }.join
+        else
+          text_breaking_wrap(html, col) 
+        end
+      end
+  
+      # Great for all browsers but opera, but doesn't work in fw:sanitize
       def breaking_wrap( s, max_width=5 )
         return s if s.blank? || s.length < max_width
         r = Regexp.new( ".{1,#{max_width}}" )

data/lib/views/layouts/webs_page.html.erb

@@ -13,6 +13,7 @@
         <% else %>
           <%= raw( %(<fw:page-title path='/' />) ) %>
         <% end %>
+        <%= yield :fw_page_title %>
       </span>
       <%= yield :fw_title %>
       <div class="clear clear_head"></div>

data/lib/webs.rb

@@ -7,7 +7,7 @@ require dir + 'helper/params'
 require dir + 'helper/tags'
 
 module Webs
-  VERSION = '0.1.26'.freeze
+  VERSION = '0.1.27'.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.26"
+  s.version = "0.1.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Olczak"]
-  s.date = %q{2011-04-12}
+  s.date = %q{2011-04-19}
   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.26
+  version: 0.1.27
 platform: ruby
 authors: 
 - Chuck Olczak
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -04:00
+date: 2011-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: []