@@ -1,18 +1,18 @@ class TextAssetFilter include Simpleton include Annotatable - + annotate :filter_name - + def filter(text) text end - + class << self def inherited(subclass) subclass.filter_name = subclass.name.to_name('Filter') end - + def filter(text) instance.filter(text) end app/models/text_asset_filter.rb @@ -2,7 +2,7 @@ class TextAssetResponseCache < ResponseCache def initialize(options={}) # Use TEXT_ASSET_CACHE_DIR but strip leading and trailing slashes (if any) - @@defaults[:directory] = RAILS_ROOT + '/' + + @@defaults[:directory] = RAILS_ROOT + '/' + TEXT_ASSET_CACHE_DIR.gsub(/^\/+/, '').gsub(/\/+$/, '') @@defaults[:expire_time] = 1.year super(options) app/models/text_asset_response_cache.rb @@ -3,7 +3,7 @@ class RenameTextAssetFilenameToName < ActiveRecord::Migration rename_column :text_assets, :filename, :name rename_column :text_asset_dependencies, :list, :names end - + def self.down rename_column :text_asset_dependencies, :names, :list rename_column :text_assets, :name, :filename db/migrate/004_rename_text_asset_filename_to_name.rb @@ -2,50 +2,50 @@ module Sns module PageTags include Radiant::Taggable class TagError < StandardError; end - + [ { :name => 'stylesheet', :class => Stylesheet, :inline_tag => 'style', :link_tag => 'link', :sample_file => 'my_file.css' }, - + { :name => 'javascript', :class => Javascript, :inline_tag => 'script', :link_tag => 'script', :sample_file => 'my_file.js' } - + ].each do |current_tag| desc %{ Renders the content from or a reference to the #{current_tag[:name]} specified in the @name@ attribute. Additionally, the @as@ attribute can be used to make the tag render as one of the following: - + * @content@ - renders the #{current_tag[:name]}'s content (this is the default when the @as@ attribute is omitted). - + * @inline@ - wraps the #{current_tag[:name]}'s content in an (X)HTML @<#{current_tag[:inline_tag]}>@ element. - + * @url@ - the url to the #{current_tag[:name]} (relative to the web root). - + * @link@ - embeds the url in an (X)HTML @<#{current_tag[:link_tag]}>@ element (creating a link to the external #{current_tag[:name]}). - - + + *Additional Options:* When rendering @as@="@inline@" or @as@="@link@", the (X)HTML @type@ attribute is automatically be set to the default #{current_tag[:name]} content-type. You can overrride this attribute or add additional ones by passing extra attributes to the @<r:#{current_tag[:name]}>@ tag. For example, <pre><code><r:#{current_tag[:name]} name="#{current_tag[:sample_file]}" as="inline" type="text/custom" id="my_id" /> produces... - + <#{current_tag[:inline_tag]} type="text/custom" id="my_id"> //<![CDATA[ Your #{current_tag[:name]}'s content here... //]]> </#{current_tag[:inline_tag]}></code></pre> - + *Usage:* <pre><code><r:#{current_tag[:name]} name="#{current_tag[:sample_file]}" [as="content | inline | url | link"] [other attribues...] /></code></pre> } @@ -55,24 +55,24 @@ module Sns case tag.attr['as'] when 'content', nil text_asset.render - + when 'url' text_asset.url - + when 'inline', 'link' mime_type = tag.attr['type'] || Sns::Config["#{current_tag[:name]}_mime_type"] optional_attribs = tag.attr.except('name', 'as', 'type').inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip optional_attribs = " #{optional_attribs}" unless optional_attribs.empty? - + if tag.attr['as'] == 'inline' %{<#{current_tag[:inline_tag]} type="#{mime_type}"#{optional_attribs}>\n//<![CDATA[\n#{text_asset.render}\n//]]>\n</#{current_tag[:inline_tag]}>} - + elsif tag.attr['as'] == 'link' && current_tag[:name] == 'stylesheet' %{<link rel="stylesheet" href="#{text_asset.url}" type="#{mime_type}"#{optional_attribs} />} - + elsif tag.attr['as'] == 'link' && current_tag[:name] == 'javascript' %{<script src="#{text_asset.url}" type="#{mime_type}"#{optional_attribs}></script>} - + end end else @@ -82,7 +82,7 @@ module Sns raise TagError.new("`#{current_tag[:name]}' tag must contain a `name' attribute.") unless tag.attr.has_key?('name') end end - + end end lib/sns/page_tags.rb @@ -1,21 +1,21 @@ module Sns module SiteControllerExt - + def self.included(base) base.class_eval do prepend_before_filter :ensure_no_login_required before_filter :parse_url_for_text_assets, :only => :show_page end end - - + + def text_asset_cache @text_asset_cache ||= TextAssetResponseCache.instance end - - + + private - + # There's some really weird behavior going on here. For some reason -- only # when running specs -- the LoginSystem seems to be reset and so, forgets # that login is not required for SiteController. This method was added to @@ -23,8 +23,8 @@ module Sns def ensure_no_login_required SiteController.no_login_required unless no_login_required? end - - + + def parse_url_for_text_assets url = params[:url] if url.kind_of?(Array) @@ -34,17 +34,17 @@ module Sns end if url =~ %r{^\/?(#{Sns::Config[:stylesheet_directory]})\/(.*)$} show_text_asset($2, 'stylesheet') - + elsif url =~ %r{^\/?(#{Sns::Config[:javascript_directory]})\/(.*)$} show_text_asset($2, 'javascript') end end - - + + def show_text_asset(name, asset_type) response.headers.delete('Cache-Control') cache_url = "#{asset_type}_cache/#{name}" - + if (request.get? || request.head?) and live? and (text_asset_cache.response_cached?(cache_url)) text_asset_cache.update_response(cache_url, response, request) @performed_render = true @@ -52,12 +52,12 @@ module Sns show_uncached_text_asset(name, asset_type, cache_url) end end - - + + def show_uncached_text_asset(name, asset_type, cache_url) @text_asset = asset_type.camelcase.constantize.find_by_name(name) mime_type = Sns::Config["#{asset_type}_mime_type"] - + unless @text_asset.nil? response.body = @text_asset.render response.headers['Status'] = ActionController::Base::DEFAULT_RENDER_STATUS_CODE @@ -67,6 +67,6 @@ module Sns @performed_render = true end end - + end end \ No newline at end of file lib/sns/site_controller_ext.rb @@ -45,10 +45,10 @@ end current_filter[:class].descendants.should include( current_filter[:reverse]) end - - + + it "should use a subclass's name as the default filter_name (SuperDuperFilter -> 'Super Duper'" do - current_filter[:simple].filter_name.should == current_filter[:simple]. + current_filter[:simple].filter_name.should == current_filter[:simple]. to_s.titleize.gsub(/\s*Filter$/, '') end @@ -56,13 +56,13 @@ end it "should allow developers to override the default with their own filter_name" do current_filter[:reverse].filter_name.should == 'Custom Filter Name' end - + it "should pass back the input text unfiltered if a filter is not explicitly defined" do current_filter[:simple].filter('my test text').should == 'my test text' end - + it "should pass return filtered text via a #filter method" do current_filter[:reverse].filter('my test text').should == 'txet tset ym' end spec/models/stylesheet_filter_and_javascript_filter_spec.rb @@ -1,23 +1,23 @@ # Module containing the methods useful for child IFRAME to parent window communication module RespondsToParent - + # Executes the response body as JavaScript in the context of the parent window. # Use this method of you are posting a form to a hidden IFRAME or if you would like # to use IFRAME base RPC. def responds_to_parent(&block) yield - + if performed? # We're returning HTML instead of JS or XML now response.headers['Content-Type'] = 'text/html; charset=UTF-8' - + # Either pull out a redirect or the request body script = if location = erase_redirect_results "document.location.href = #{location.to_s.inspect}" else response.body end - + # Escape quotes, linebreaks and slashes, maintaining previously escaped slashes # Suggestions for improvement? script = (script || ''). @@ -28,8 +28,8 @@ module RespondsToParent # Clear out the previous render to prevent double render erase_results - - # Eval in parent scope and replace document location of this frame + + # Eval in parent scope and replace document location of this frame # so back button doesn't replay action on targeted forms # loc = document.location to be set after parent is updated for IE # with(window.parent) - pull in variables from parent window @@ -37,7 +37,7 @@ module RespondsToParent # window.eval - legal eval for Opera render :text => "<html><body><script type='text/javascript' charset='utf-8'> var loc = document.location; - with(window.parent) { setTimeout(function() { window.eval('#{script}'); loc.replace('about:blank'); }, 1) } + with(window.parent) { setTimeout(function() { window.eval('#{script}'); loc.replace('about:blank'); }, 1) } </script></body></html>" end end vendor/plugins/responds_to_parent/lib/responds_to_parent.rb @@ -4,46 +4,46 @@ require 'test_help' class IFrameController < ActionController::Base def normal - render :update do |page| + render :update do |page| page.alert "foo" end end - + def aliased respond_to_parent do render :text => 'woot' end end - + def redirect responds_to_parent do redirect_to '/another/place' end end - + def no_block responds_to_parent end - + def empty_render responds_to_parent do end - + render :text => '' end - + def quotes responds_to_parent do render :text => %(single' double" qs\\' qd\\" escaped\\\' doubleescaped\\\\') end end - + def newlines responds_to_parent do render :text => "line1\nline2\\nline2" end end - + def update responds_to_parent do render :update do |page| @@ -52,7 +52,7 @@ class IFrameController < ActionController::Base end end end - + def rescue_action(e) raise e end @@ -64,48 +64,48 @@ class RespondsToParentTest < Test::Unit::TestCase @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new end - + def test_normal get :normal assert_match /alert\("foo"\)/, @response.body assert_no_match /window\.parent/, @response.body end - + def test_quotes_should_be_escaped render :quotes assert_match %r{eval\('single\\' double\\" qs\\\\\\' qd\\\\\\" escaped\\\\\\' doubleescaped\\\\\\\\\\'}, @response.body end - + def test_newlines_should_be_escaped render :newlines assert_match %r{eval\('line1\\nline2\\\\nline2'\)}, @response.body end - + def test_no_block_should_raise assert_raises LocalJumpError do get :no_block end end - + def test_empty_render_should_not_expand_javascript get :empty_render assert_equal '', @response.body end - + def test_update_should_perform_combined_rjs render :update assert_match /alert\(\\"foo\\"\);\\nalert\(\\"bar\\"\)/, @response.body end - + def test_aliased_method_should_not_raise assert_nothing_raised do render :aliased assert_match /eval\('woot'\)/, @response.body end end - + protected - + def render(action) get action assert_match /<script type='text\/javascript'/, @response.body vendor/plugins/responds_to_parent/test/responds_to_parent_test.rb 15140c849a09d6cabcdf1c35feccd4b2bb77f7a0 Chris Parrish chris.parrish-gitmail@swankinnovations.com http://github.com/SwankInnovations/radiant-sns-extension/commit/48a9599a16437dd1bf803ff1be3bb599c690fa43 48a9599a16437dd1bf803ff1be3bb599c690fa43 2008-11-22T00:16:12-08:00 2008-11-22T00:16:12-08:00 Clean up code spacing. f7088f762d07b9871877e71b3df7e78a4519b92d Chris Parrish chris.parrish-gitmail@swankinnovations.com