webs 0.1.37 → 0.1.38

data/Rakefile

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

@@ -42,18 +42,18 @@ module Webs
       nil
     end
 
-    def get_data( &block )
+    def cache_capture_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
+      return cache_capture_data( &block ) if off
      
       unless ( data=cache_read(key) )
         # if self responds to capture this is called from a view which means we can cache snippets
-        data = get_data( &block )
+        data = cache_capture_data( &block )
         cache_write( key.to_s, data, options )
       end
       data
@@ -71,7 +71,7 @@ module Webs
     def cache_snippet(snippet, key, options={}, &block)
       return snippet.html_safe if !snippet.blank?
       if options.delete(:ignore_cache)
-        get_data( &block )
+        cache_capture_data( &block )
       else
         cache_block( key, options, &block )
       end

data/lib/controller/webs_controller.rb

@@ -83,7 +83,6 @@ module Webs
         if partials && partials.any?
           partials.each do |p| 
             p = render_to_string( :partial=>p ) 
-#            Rails.logger.debug "************ PARTIAL=> #{p}"
             render_text += p 
           end
         end

data/lib/helper/tags.rb

@@ -8,49 +8,110 @@ module Webs
       # Renders:
       #
       # <fw:blah>HELLO<fw:fwml_attribute name="value"><fw:name uid="xxx"/></fw:fwml_attribute></fw:blah>
+      # can take an option: :tokens which is a hash for replacement and will add in the appropriate fw:intl-token tags 
+      # ex: 
+      #  <%= fwml :intl, :description=>"bogus", :tokens=>{ :tier=>"Tier 1", :image_limit=>"10", :upgrade_link=>"www.blah.com" } do %>
+      #    As a {tier} member, each of your products can have a maximum of {image_limit}.
+      #    Need more? Time to upgrade!
+      #    {upgrade_link}
+      #  <% end %>
+      #
+      #  Should Yield:
+      #
+      #  <fw:intl description="bogus">
+      #    As a {tier} member, each of your products can have a maximum of {image_limit}.
+      #    Need more? Time to upgrade!
+      #    {upgrade_link}
+      #    <fw:intl-token name="tier">Tier 1</fw:intl-token> 
+      #    <fw:intl-token name="image_limit">10</fw:intl-token>
+      #    <fw:intl-token name="upgrade_link">www.blah.com</fw:intl-token>
+      #  </fw:intl>
+      #
+      # You should also be able to use it without a body, so this should work:
+      # <% rubystring = 'hello world' %>
+      # <%= fwml :intl, :value=rubystring %>
+      # 
+      # Should Yield
+      #
+      # <fw:intl>hello world</fw:intl>
+      #
 
       def fwml tagname, options={}, &block
-        attributes = options.delete( :fw_attributes )
 #        Rails.logger.debug "****** fwml #{tagname} #{options.inspect}"
         tagname = tagname.to_s unless tagname.nil?
-        if ['sanitize', 'wizzywig', 'intl'].include?(tagname)
+        if ['sanitize', 'wizzywig'].include?(tagname)
           tag = self.send( "fw_#{tagname}", options, &block )
         else
           if block
             tag = render_tag_with_block tagname, options, false, &block
           else
-            tag = inline_tag( tagname, attributes, options )
+            tag = inline_tag( tagname, options )
           end
         end
 
-        if attributes 
-          tagidx = tag.length - (tagname.length + 6)
-          attribute_str = attributes.keys.collect{ |k| %[<fw:fwml-attribute name="#{k}">#{attributes[k]}</fw:fwml-attribute>] }.join( "\n" )
-          tag = tag[0..tagidx-1] + attribute_str.html_safe + tag[tagidx..tag.length-1]
-        end
-
-        tag.html_safe 
+        html_safe_check( tag )
       end
       
       private
+      def html_safe_check s
+        return s if s.blank?
+        s.respond_to?( 'html_safe' ) ? s.html_safe : s
+      end
+
       def html_options options
         ' ' + options.each_key.select{ |k| !options[k].blank? }.collect{|k| "#{k.to_s}=\"#{options[k]}\"" }.join(' ')  if options.any?
       end
+
+      def parse_fwml_options tagname, options
+        s = ''
+        if ( attrs = options.delete( :fw_attributes ) )
+          s += attr_hash.keys.collect{ |k| %[<fw:fwml-attribute name="#{k}">#{attributes[k]}</fw:fwml-attribute>] }.join( "\n" )
+        end
+        if ( intl_attrs = options.delete( :fw_intl_attrs ) )
+          s += attr_hash.keys.collect{ |k| %[<fw:fwml-attribute name="#{k}">#{attributes[k]}</fw:fwml-attribute>] }.join( "\n" )
+        end
+        if tagname == 'intl' && ( tokens = options.delete( :tokens ) )
+          s += token_str = tokens.keys.collect{ |k| %[<fw:intl-token name="#{k}">#{tokens[k]}</fw:intl-token>] }.join( "\n" )
+        end
+        s
+      end
       
       def render_tag_with_block tagname, options, cdata_wrapper=false, &block
-#        Rails.logger.debug "****** render_tag_with_block #{tagname} #{options.inspect} cdata=#{cdata_wrapper}"
         content = capture(&block)
-        output = ActiveSupport::SafeBuffer.new
-        output.safe_concat("<fw:#{tagname}#{html_options(options)}>")
-        output.safe_concat("<![CDATA[") if cdata_wrapper
-        output << content  
-        output.safe_concat("]]>") if cdata_wrapper
-        output.safe_concat("</fw:#{tagname}>")
+
+        # parse attributes to append before closing tag
+        append_str = parse_fwml_options tagname, options 
+
+        output = begin
+          ActiveSupport::SafeBuffer.new
+        rescue
+          nil
+        end
+
+        if output
+          # RAILS3
+          output.safe_concat("<fw:#{tagname}#{html_options(options)}>")
+          output.safe_concat("<![CDATA[") if cdata_wrapper
+          output << content  
+          output.safe_concat( append_str ) if !append_str.blank?
+          output.safe_concat("]]>") if cdata_wrapper
+          output.safe_concat("</fw:#{tagname}>")
+        else
+          # RAILS2
+          concat("<fw:#{tagname}#{html_options(options)}>", block.binding)
+          concat("<![CDATA[", block.binding) if cdata_wrapper
+          concat( content, block.binding)
+          concat( append_str, block.binding ) if !append_str.blank?
+          concat("]]>", block.binding) if cdata_wrapper
+          concat("</fw:#{tagname}>", block.binding)
+        end
       end
       
-      def inline_tag( tagname, attributes, options={} )
-        if attributes
-          "<fw:#{tagname}#{html_options(options)}></fw:#{tagname}>"
+      def inline_tag( tagname, options={} )
+        value = options.delete( :value ) if ['intl'].include?(tagname)
+        append_str = parse_fwml_options tagname, options 
+        if !append_str.blank? || !value.blank?
+          "<fw:#{tagname}#{html_options(options)}>#{value}#{append_str}</fw:#{tagname}>"
         else
           "<fw:#{tagname}#{html_options(options)}/>"
         end
@@ -65,57 +126,8 @@ module Webs
       # fw_wizzywig should never be called with a block the text is passed in via text
       def fw_wizzywig options={}
         wizzywig_text = options.delete( :wizzywig_text )
-        "<fw:wizzywig #{html_options(options)}><![CDATA[#{wizzywig_text}]]></fw:wizzywig>".html_safe
+        html_safe_check "<fw:wizzywig #{html_options(options)}><![CDATA[#{wizzywig_text}]]></fw:wizzywig>"
       end
-      
-      # can take an option: :tokens which is a hash for replacement and will add in the appropriate fw:intl-token tags 
-      # ex: 
-      #  <%= fwml :intl, :description=>"bogus", :tokens=>{ :tier=>"Tier 1", :image_limit=>"10", :upgrade_link=>"www.blah.com" } do %>
-      #    As a {tier} member, each of your products can have a maximum of {image_limit}.
-      #    Need more? Time to upgrade!
-      #    {upgrade_link}
-      #  <% end %>
-      #
-      #  Should Yield:
-      #
-      #  <fw:intl description="bogus">
-      #    As a {tier} member, each of your products can have a maximum of {image_limit}.
-      #    Need more? Time to upgrade!
-      #    {upgrade_link}
-      #    <fw:intl-token name="tier">Tier 1</fw:intl-token> 
-      #    <fw:intl-token name="image_limit">10</fw:intl-token>
-      #    <fw:intl-token name="upgrade_link">www.blah.com</fw:intl-token>
-      #  </fw:intl>
-      #
-      # You should also be able to use it without a body, so this should work:
-      # <% rubystring = 'hello world' %>
-      # <%= fwml :intl, :value=rubystring %>
-      # 
-      # Should Yield
-      #
-      # <fw:intl>hello world</fw:intl>
-      #
-      def fw_intl options={}, &block
-
-        value = options.delete( :value)
-        tokens = options.delete( :tokens )
-        if block
-          tag = render_tag_with_block 'intl', options, false, &block
-          
-          idx = tag.length - 10
-          token_str = tokens.keys.collect{ |k| %[<fw:intl-token name="#{k}">#{tokens[k]}</fw:intl-token>] }.join( "\n" )
-          (tag[0..idx-1] + token_str.html_safe + tag[idx..tag.length-1]).html_safe
-        else
-          %[<fw:intl#{html_options(options)}>#{h value}</fw:intl>].html_safe
-        end
-      end
-    end
+    end     
   end
 end
-
-# No support for rails 2
-# concat("<fw:#{tagname}#{s_options}>", block.binding)
-# concat("<![CDATA[") if cdata_wrapper
-# concat( content, block.binding)
-# concat("]]>") if cdata_wrapper
-# concat("</fw:#{tagname}>", block.binding)

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

@@ -6,6 +6,7 @@
     <% if @jquery_noconflict %>
       <%= render :partial=>'shared/jquery_noconflict' %>
     <% end %>
+    <%= csrf_meta_tag %>
   </fw:head>
 
   <fw:paragraph>

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

@@ -3,6 +3,7 @@
     <%= javascript_include_tag 'application' %>
     <%= stylesheet_link_tag 'styles' %>
     <%= yield :fw_head %>
+    <%= csrf_meta_tag %>
   </fw:head>
   <%= yield %>
 <% end %>

data/lib/webs.rb

@@ -7,16 +7,18 @@ require dir + 'helper/params'
 require dir + 'helper/tags'
 
 module Webs
-  VERSION = '0.1.37'.freeze
+  VERSION = '0.1.38'.freeze
 
   def self.app_title
     APP_NAME.titleize
   end
-  
-  class Railtie < Rails::Railtie
-    initializer 'webs_view-path' do |app|
-      path = "#{Pathname(__FILE__).dirname.expand_path}/views"
-      app.paths.app.views.push path
+ 
+  if defined?( Rails::Railtie )
+    class Railtie < Rails::Railtie
+      initializer 'webs_view-path' do |app|
+        path = "#{Pathname(__FILE__).dirname.expand_path}/views"
+        app.paths.app.views.push path
+      end
     end
   end
 end

data/webs.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webs}
-  s.version = "0.1.37"
+  s.version = "0.1.38"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Olczak"]
-  s.date = %q{2011-06-01}
+  s.date = %q{2011-06-02}
   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.37
+  version: 0.1.38
 platform: ruby
 authors: 
 - Chuck Olczak
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 -04:00
+date: 2011-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: []