vendor/plugins/filtered_column_code_macro/init.rb vendor/plugins/filtered_column_code_macro/lib/code_macro.rb vendor/plugins/filtered_column_code_macro/lib/coderay.rb vendor/plugins/filtered_column_code_macro/lib/coderay/duo.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoder.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/_map.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/count.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/debug.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/div.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/html.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/html/classes.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/html/css.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/html/numerization.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/html/output.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/null.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/page.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/span.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/statistic.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/text.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/tokens.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/xml.rb vendor/plugins/filtered_column_code_macro/lib/coderay/encoders/yaml.rb vendor/plugins/filtered_column_code_macro/lib/coderay/helpers/filetype.rb vendor/plugins/filtered_column_code_macro/lib/coderay/helpers/gzip_simple.rb vendor/plugins/filtered_column_code_macro/lib/coderay/helpers/plugin.rb vendor/plugins/filtered_column_code_macro/lib/coderay/helpers/word_list.rb vendor/plugins/filtered_column_code_macro/lib/coderay/scanner.rb vendor/plugins/filtered_column_code_macro/lib/coderay/scanners/_map.rb vendor/plugins/filtered_column_code_macro/lib/coderay/scanners/c.rb vendor/plugins/filtered_column_code_macro/lib/coderay/scanners/delphi.rb vendor/plugins/filtered_column_code_macro/lib/coderay/scanners/html.rb vendor/plugins/filtered_column_code_macro/lib/coderay/scanners/nitro_xhtml.rb vendor/plugins/filtered_column_code_macro/lib/coderay/scanners/plaintext.rb vendor/plugins/filtered_column_code_macro/lib/coderay/scanners/rhtml.rb vendor/plugins/filtered_column_code_macro/lib/coderay/scanners/ruby.rb vendor/plugins/filtered_column_code_macro/lib/coderay/scanners/ruby/patterns.rb vendor/plugins/filtered_column_code_macro/lib/coderay/scanners/xml.rb vendor/plugins/filtered_column_code_macro/lib/coderay/style.rb vendor/plugins/filtered_column_code_macro/lib/coderay/styles/_map.rb vendor/plugins/filtered_column_code_macro/lib/coderay/styles/cycnus.rb vendor/plugins/filtered_column_code_macro/lib/coderay/styles/murphy.rb vendor/plugins/filtered_column_code_macro/lib/coderay/tokens.rb vendor/plugins/filtered_column_code_macro/test/abstract_unit.rb vendor/plugins/filtered_column_code_macro/test/code_macro_test.rb @@ -27,10 +27,9 @@ module FilteredColumn end protected - def process_macros?() true end def process_filters filtered_attributes.each do |attr_name| - send "#{attr_name}_html=", FilteredColumn::Processor.process_filters(filters_for_attribute(attr_name), send(attr_name), process_macros?) + send "#{attr_name}_html=", FilteredColumn::Processor.process_filters(filters_for_attribute(attr_name), send(attr_name)) end end vendor/plugins/filtered_column/lib/filtered_column/mixin.rb @@ -10,14 +10,14 @@ module FilteredColumn ] class << self - def process_filters(filters, text_to_filter, macros = true) + def process_filters(filters, text_to_filter) return '' if text_to_filter.blank? - text_to_filter = [filters].flatten.inject(text_to_filter) { |txt, filter_name| filter_text filter_name, txt } - process_macros(text_to_filter) if macros - text_to_filter + process_macros(text_to_filter) if FilteredColumn.macros.any? + [filters].flatten.inject(text_to_filter) { |txt, filter_name| filter_text filter_name, txt } end def filter_text(filter_name, text_to_filter) + puts filter_name if FilteredColumn.filters[filter_name.to_sym].nil? FilteredColumn.filters[filter_name.to_sym].filter text_to_filter end vendor/plugins/filtered_column/lib/filtered_column/processor.rb @@ -2,63 +2,4 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') require 'test/unit' require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment.rb')) -require 'breakpoint' - -Test::Unit::TestCase.class_eval do - def assert_filters_called_on(*filters) - FilteredColumn::Processor.called_filters = [] - filtered = yield - filtered.save if filtered - assert_equal filters.length, (FilteredColumn::Processor.called_filters & filters).length, "#{filters.join(', ')} expected, #{FilteredColumn::Processor.called_filters.join(', ')} called" - end - - def assert_no_filters_called_on(klass, &block) - assert_filters_called_on &block - end -end - -class FilteredColumn::Macros::Sample - def self.filter(attributes, inner_text = '', text = '') - "foo: #{attributes[:foo]} - flip: #{attributes[:flip]} - text: #{inner_text}" - end -end - -FilteredColumn.macros[:sample_macro] = nil - -class << FilteredColumn::Processor - @@called_filters = [] - cattr_accessor :called_filters - def filter_text_with_audit(filter_name, text_to_filter) - (called_filters << filter_name).uniq! - filter_text_without_audit(filter_name, text_to_filter) - end - alias_method_chain :filter_text, :audit -end - -class Article < ActiveRecord::Base - def self.columns() @columns ||= []; end - def self.column(name, sql_type = nil, default = nil, null = true) - columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null) - end - - column :body, :string - column :body_html, :string - column :textile_body, :string - column :textile_body_html, :string - column :textile_and_markdown_body, :string - column :textile_and_markdown_body_html, :string - column :no_textile_body, :string - column :no_textile_body_html, :string - column :filters, :text - column :sample_macro_body, :string - column :sample_macro_body_html, :string - - filtered_column :body - filtered_column :textile_body, :only => :textile_filter - filtered_column :textile_and_markdown_body, :only => [:textile_filter, :markdown_filter] - filtered_column :no_textile_body, :except => :textile_filter - - def save - valid? && send(:callback, :before_save) && true - end -end \ No newline at end of file +require 'breakpoint' \ No newline at end of file vendor/plugins/filtered_column_flickr_macro/test/abstract_unit.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), 'abstract_unit') -class MacroFilterTest < Test::Unit::TestCase +class FlickrMacroTest < Test::Unit::TestCase def test_should_retrieve_macro assert_equal FlickrMacro, FilteredColumn.macros[:flickr_macro] end vendor/plugins/filtered_column_flickr_macro/test/flickr_macro_test.rb vendor/coderay/lib/coderay.rb vendor/coderay/lib/coderay/duo.rb vendor/coderay/lib/coderay/encoder.rb vendor/coderay/lib/coderay/encoders/_map.rb vendor/coderay/lib/coderay/encoders/count.rb vendor/coderay/lib/coderay/encoders/debug.rb vendor/coderay/lib/coderay/encoders/div.rb vendor/coderay/lib/coderay/encoders/html.rb vendor/coderay/lib/coderay/encoders/html/classes.rb vendor/coderay/lib/coderay/encoders/html/css.rb vendor/coderay/lib/coderay/encoders/html/numerization.rb vendor/coderay/lib/coderay/encoders/html/output.rb vendor/coderay/lib/coderay/encoders/null.rb vendor/coderay/lib/coderay/encoders/page.rb vendor/coderay/lib/coderay/encoders/span.rb vendor/coderay/lib/coderay/encoders/statistic.rb vendor/coderay/lib/coderay/encoders/text.rb vendor/coderay/lib/coderay/encoders/tokens.rb vendor/coderay/lib/coderay/encoders/xml.rb vendor/coderay/lib/coderay/encoders/yaml.rb vendor/coderay/lib/coderay/helpers/filetype.rb vendor/coderay/lib/coderay/helpers/gzip_simple.rb vendor/coderay/lib/coderay/helpers/plugin.rb vendor/coderay/lib/coderay/helpers/word_list.rb vendor/coderay/lib/coderay/scanner.rb vendor/coderay/lib/coderay/scanners/_map.rb vendor/coderay/lib/coderay/scanners/c.rb vendor/coderay/lib/coderay/scanners/delphi.rb vendor/coderay/lib/coderay/scanners/html.rb vendor/coderay/lib/coderay/scanners/nitro_xhtml.rb vendor/coderay/lib/coderay/scanners/plaintext.rb vendor/coderay/lib/coderay/scanners/rhtml.rb vendor/coderay/lib/coderay/scanners/ruby.rb vendor/coderay/lib/coderay/scanners/ruby/patterns.rb vendor/coderay/lib/coderay/scanners/xml.rb vendor/coderay/lib/coderay/style.rb vendor/coderay/lib/coderay/styles/_map.rb vendor/coderay/lib/coderay/styles/cycnus.rb vendor/coderay/lib/coderay/styles/murphy.rb vendor/coderay/lib/coderay/tokens.rb e4037c84e795a68e2cca6bb159ec4ba10ba45ca9 technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/emk/mephisto/commit/fc972ebfb3f0d7e32537458bfe7828b1026a44f1 fc972ebfb3f0d7e32537458bfe7828b1026a44f1 2006-08-13T23:31:10-07:00 2006-08-13T23:31:10-07:00 add code macro git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@1613 567b1171-46fb-0310-a4c9-b4bef9110e78 782a3831d29832f185d6ce0ab0258697b5b3727d technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78