vigetlabs-acts_as_markup 1.2.1 → 1.3.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 1.3.0 / 2008-11-19
+* Add ability to accept options that will be passed to supported markup parsers. (chewi[http://github.com/chewi/])
+
 == 1.2.0 / 2008-09-10
 * Allow all objects to have a to_html method that defaults as to_s instead just doing this for strings. (idea from crnixon[http://github.com/crnixon/])
 * Add string methods to all markup objects via the StringLike mixin. (crnixon[http://github.com/crnixon/])

data/README.rdoc

@@ -27,6 +27,13 @@ a config value in your environment.rb file:
 
 By default RDiscount will be used.
 
+You can specify additional options to pass to the markup library by using
+<tt>:markdown_options</tt>, <tt>:textile_options</tt> or <tt>:wikitext_options</tt>.
+RDoc does not support any useful options. The options should be given as an
+array of arguments. You can specify options for multiple languages when
+allowing more than one. See each library's documentation for more details on
+what options are available.
+
 == EXAMPLES:
 
 ==== Using +acts_as_markdown+:
@@ -96,6 +103,21 @@ By default RDiscount will be used.
     @post.body.to_html         # => "<h2> Markdown Headline</h2>"
     
 
+==== Using options
+
+    class Post < ActiveRecord
+      acts_as_markdown :body, :markdown_options => [ :filter_html ]
+    end
+    
+    class Post < ActiveRecord
+      acts_as_textile :body, :textile_options => [ [ :filter_html ] ]
+    end
+    
+    class Post < ActiveRecord
+      acts_as_wikitext :body, :wikitext_options => [ { :space_to_underscore => true } ]
+    end
+    
+
 == REQUIREMENTS:
 
 You will need the RedCloth[http://whytheluckystiff.net/ruby/redcloth/] library 
@@ -138,7 +160,7 @@ Make a fork on GitHub, make your changes and do a pull request. Good places to s
 3. Add the same lines you added to the previous "<tt>when</tt>" statement to the "<tt>:variable</tt>" "<tt>when</tt>" statement. But replace "<tt>klass</tt>" with "<tt>language_klass</tt>" (e.g. "<tt>markdown_klass</tt>").
 4. Add a relevant "<tt>when</tt>" statement to the <tt>class_eval</tt> block for the "<tt>:variable</tt>" language option. This should look something like:
        when /markdown/i
-         @#{col.to_s} = #{markdown_klass}.new(self['#{col.to_s}'].to_s)
+         markup_klasses[:markdown].new self[col].to_s
 5. Add a convenience method (e.g. "<tt>acts_as_markdown</tt>")
 6. Add an extension file to the "lib/acts_as_markup/exts/" directory if you need to modify the object in anyway.
 7. Add appropriate tests (see current tests).

data/Rakefile

@@ -18,7 +18,6 @@ PROJ.rubyforge.name = 'viget'
 PROJ.version = ActsAsMarkup::VERSION
 PROJ.rdoc.include = %w(^lib/ LICENSE CHANGELOG README\.rdoc)
 PROJ.rdoc.remote_dir = 'acts_as_markup'
-PROJ.test.files = FileList['test/**/*_test.rb']
 PROJ.rcov.opts = ['--no-html', '-T', '--sort coverage',
                   '-x "\/Library\/Ruby\/"', 
                   '-x "\/opt\/local\/lib/ruby"',

data/acts_as_markup.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{acts_as_markup}
-  s.version = "1.2.1"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Landau"]
-  s.date = %q{2008-09-30}
+  s.date = %q{2008-11-19}
   s.description = %q{Represent ActiveRecord Markdown, Textile, Wiki text, RDoc columns as Markdown, Textile Wikitext, RDoc objects using various external libraries to convert to HTML.}
   s.email = %q{brian.landau@viget.com}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc"]
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{viget}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{Represent ActiveRecord Markdown, Textile, Wiki text, RDoc columns as Markdown, Textile Wikitext, RDoc objects using various external libraries to convert to HTML}
   s.test_files = ["test/acts_as_markdown_test.rb", "test/acts_as_markup_test.rb", "test/acts_as_rdoc_test.rb", "test/acts_as_textile_test.rb", "test/acts_as_wikitext_test.rb"]
 
@@ -22,24 +22,24 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.1.1"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.1.1"])
-      s.add_runtime_dependency(%q<rdiscount>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<RedCloth>, [">= 4.0.3"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.2.1"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.2.1"])
+      s.add_runtime_dependency(%q<rdiscount>, [">= 1.2.11"])
+      s.add_runtime_dependency(%q<RedCloth>, [">= 4.1.0"])
       s.add_runtime_dependency(%q<wikitext>, [">= 1.2.1"])
     else
-      s.add_dependency(%q<activesupport>, [">= 2.1.1"])
-      s.add_dependency(%q<activerecord>, [">= 2.1.1"])
-      s.add_dependency(%q<rdiscount>, [">= 1.2.9"])
-      s.add_dependency(%q<RedCloth>, [">= 4.0.3"])
+      s.add_dependency(%q<activesupport>, [">= 2.2.1"])
+      s.add_dependency(%q<activerecord>, [">= 2.2.1"])
+      s.add_dependency(%q<rdiscount>, [">= 1.2.11"])
+      s.add_dependency(%q<RedCloth>, [">= 4.1.0"])
       s.add_dependency(%q<wikitext>, [">= 1.2.1"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 2.1.1"])
-    s.add_dependency(%q<activerecord>, [">= 2.1.1"])
-    s.add_dependency(%q<rdiscount>, [">= 1.2.9"])
-    s.add_dependency(%q<RedCloth>, [">= 4.0.3"])
+    s.add_dependency(%q<activesupport>, [">= 2.2.1"])
+    s.add_dependency(%q<activerecord>, [">= 2.2.1"])
+    s.add_dependency(%q<rdiscount>, [">= 1.2.11"])
+    s.add_dependency(%q<RedCloth>, [">= 4.1.0"])
     s.add_dependency(%q<wikitext>, [">= 1.2.1"])
   end
 end

data/lib/acts/as_markup.rb

@@ -20,13 +20,20 @@ module ActiveRecord # :nodoc:
         # the correct object (Markdown, Textile, Wikitext or RDoc) based on the value 
         # of the language column. If any value besides markdown, textile, wikitext, or 
         # RDoc is supplied for the markup language the text will pass through as a string.
+        #
+        # You can specify additional options to pass to the markup library by using
+        # <tt>:markdown_options</tt>, <tt>:textile_options</tt> or <tt>:wikitext_options</tt>.
+        # RDoc does not support any useful options. The options should be given as an array
+        # of arguments. You can specify options for more than one language when using
+        # <tt>:variable</tt>. See each library's documentation for more details on what
+        # options are available.
         # 
         # 
         # ==== Examples
         # 
         # ===== Using Markdown language
         # 
-        #     class Post < ActiveRecrod
+        #     class Post < ActiveRecord
         #       acts_as_markup :language => :markdown, :columns => [:body]
         #     end
         #     
@@ -37,7 +44,7 @@ module ActiveRecord # :nodoc:
         # 
         # ===== Using variable language
         # 
-        #     class Post < ActiveRecrod
+        #     class Post < ActiveRecord
         #       acts_as_markup :language => :variable, :columns => [:body], :language_column => 'language_name'
         #     end
         #     
@@ -47,6 +54,21 @@ module ActiveRecord # :nodoc:
         #     @post.body.to_html         # => "<h2> Markdown Headline</h2>"
         #     
         # 
+        # ===== Using options
+        # 
+        #     class Post < ActiveRecord
+        #       acts_as_markup :language => :markdown, :columns => [:body], :markdown_options => [ :filter_html ]
+        #     end
+        #     
+        #     class Post < ActiveRecord
+        #       acts_as_markup :language => :textile, :columns => [:body], :textile_options => [ [ :filter_html ] ]
+        #     end
+        #     
+        #     class Post < ActiveRecord
+        #       acts_as_markup :language => :wikitext, :columns => [:body], :wikitext_options => [ { :space_to_underscore => true } ]
+        #     end
+        #     
+        # 
         def acts_as_markup(options)
           case options[:language].to_sym
           when :markdown, :textile, :wikitext, :rdoc
@@ -61,70 +83,77 @@ module ActiveRecord # :nodoc:
             raise ActsAsMarkup::UnsupportedMarkupLanguage, "#{options[:langauge]} is not a currently supported markup language."
           end
           
-          options[:columns].each do |col|
-            unless options[:language].to_sym == :variable
-              class_eval <<-EOV
-                def #{col.to_s}
-                  if @#{col.to_s}
-                    unless self.#{col.to_s}_changed?
-                      return @#{col.to_s}
-                    end
+          unless options[:language].to_sym == :variable
+            markup_options = options["#{options[:language]}_options".to_sym] || []
+            options[:columns].each do |col|
+              define_method col do
+                if instance_variable_defined?("@#{col}")
+                  unless send("#{col}_changed?")
+                    return instance_variable_get("@#{col}")
                   end
-                  @#{col.to_s} = #{klass}.new(self['#{col.to_s}'].to_s)
                 end
-              EOV
-            else
-              class_eval <<-EOV
-                def #{col.to_s}
-                  if @#{col.to_s}
-                    unless self.#{col.to_s}_changed? || self.#{options[:language_column].to_s}_changed?
-                      return @#{col.to_s}
-                    end
-                  end
-                  case self.#{options[:language_column].to_s}
-                  when /markdown/i
-                    @#{col.to_s} = #{markup_klasses[:markdown]}.new(self['#{col.to_s}'].to_s)
-                  when /textile/i
-                    @#{col.to_s} = #{markup_klasses[:textile]}.new(self['#{col.to_s}'].to_s)
-                  when /wikitext/i
-                    @#{col.to_s} = #{markup_klasses[:wikitext]}.new(self['#{col.to_s}'].to_s)
-                  when /rdoc/i
-                    @#{col.to_s} = #{markup_klasses[:rdoc]}.new(self['#{col.to_s}'].to_s)
-                  else
-                    @#{col.to_s} = self['#{col.to_s}']
+                instance_variable_set("@#{col}", klass.new(self[col].to_s, *markup_options))
+              end
+            end
+          else
+            options[:columns].each do |col|
+              define_method col do
+                if instance_variable_defined?("@#{col}")
+                  unless send("#{col}_changed?") || send("#{options[:language_column]}_changed?")
+                    return instance_variable_get("@#{col}")
                   end
                 end
-              EOV
+                instance_variable_set("@#{col}", case send(options[:language_column])
+                when /markdown/i
+                  markup_klasses[:markdown].new self[col].to_s, *(options[:markdown_options] || [])
+                when /textile/i
+                  markup_klasses[:textile].new self[col].to_s, *(options[:textile_options] || [])
+                when /wikitext/i
+                  markup_klasses[:wikitext].new self[col].to_s, *(options[:wikitext_options] || [])
+                when /rdoc/i
+                  markup_klasses[:rdoc].new self[col].to_s
+                else
+                  self[col]
+                end)
+              end
             end
           end
         end
         
         # This is a convenience method for 
         # `<tt>acts_as_markup :language => :markdown, :columns => [:body]</tt>`
+        # Additional options can be given at the end, if necessary.
         # 
         def acts_as_markdown(*columns)
-          acts_as_markup :language => :markdown, :columns => columns
+          options = columns.extract_options!
+          acts_as_markup options.merge(:language => :markdown, :columns => columns)
         end
         
         # This is a convenience method for 
         # `<tt>acts_as_markup :language => :textile, :columns => [:body]</tt>`
+        # Additional options can be given at the end, if necessary.
         #
         def acts_as_textile(*columns)
-          acts_as_markup :language => :textile, :columns => columns
+          options = columns.extract_options!
+          acts_as_markup options.merge(:language => :textile, :columns => columns)
         end
         
         # This is a convenience method for 
         # `<tt>acts_as_markup :language => :wikitext, :columns => [:body]</tt>`
+        # Additional options can be given at the end, if necessary.
         #
         def acts_as_wikitext(*columns)
-          acts_as_markup :language => :wikitext, :columns => columns
+          options = columns.extract_options!
+          acts_as_markup options.merge(:language => :wikitext, :columns => columns)
         end
         
         # This is a convenience method for 
         # `<tt>acts_as_markup :language => :rdoc, :columns => [:body]</tt>`
+        # Additional options can be given at the end, if necessary.
         #
         def acts_as_rdoc(*columns)
-          acts_as_markup :language => :rdoc, :columns => columns
+          options = columns.extract_options!
+          acts_as_markup options.merge(:language => :rdoc, :columns => columns)
         end
         
         
@@ -134,7 +163,7 @@ module ActiveRecord # :nodoc:
               markdown_library_names = ActsAsMarkup::MARKDOWN_LIBS[ActsAsMarkup.markdown_library]
               require markdown_library_names[:lib_name]
               require_extensions(markdown_library_names[:lib_name])
-              return markdown_library_names[:class_name]
+              return markdown_library_names[:class_name].constantize
             else
               raise ActsAsMarkup::UnsportedMarkdownLibrary, "#{ActsAsMarkup.markdown_library} is not currently supported."
             end
@@ -142,7 +171,7 @@ module ActiveRecord # :nodoc:
           
           def require_extensions(library)# :nodoc:
             if ActsAsMarkup::LIBRARY_EXTENSIONS.include? library.to_s
-              require "acts_as_markup/exts/#{library.to_s}"
+              require "#{ActsAsMarkup::LIBPATH}/acts_as_markup/exts/#{library}"
             end
           end
           
@@ -152,18 +181,18 @@ module ActiveRecord # :nodoc:
               return get_markdown_class
             when :textile
               require 'redcloth'
-              return 'RedCloth'
+              return RedCloth
             when :wikitext
               require 'wikitext'
               require_extensions 'wikitext'
-              return 'WikitextString'
+              return WikitextString
             when :rdoc
               require 'rdoc/markup/simple_markup'
               require 'rdoc/markup/simple_markup/to_html'
               require_extensions 'rdoc'
-              return 'RDocText'
+              return RDocText
             else
-              return 'String'
+              return String
             end
           end
         

data/lib/acts_as_markup/exts/wikitext.rb

@@ -8,10 +8,10 @@ class WikitextString < String
   attr_reader :text
   attr_reader :html
   
-  def initialize(str)
+  def initialize(str, *options)
     super(str)
     @text = str.to_s
-    @html = Wikitext::Parser.new.parse(@text)
+    @html = Wikitext::Parser.new(*options).parse(@text)
   end
   
   def to_html

data/lib/acts_as_markup.rb

@@ -2,7 +2,7 @@ require 'active_support'
 
 module ActsAsMarkup
   # :stopdoc:
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/tasks/gem.rake

@@ -1,6 +1,92 @@
-# $Id$
 
-require 'rake/gempackagetask'
+require 'find'
+require 'rake/packagetask'
+require 'rubygems/user_interaction'
+require 'rubygems/builder'
+
+module Bones
+class GemPackageTask < Rake::PackageTask
+  # Ruby GEM spec containing the metadata for this package.  The
+  # name, version and package_files are automatically determined
+  # from the GEM spec and don't need to be explicitly provided.
+  #
+  attr_accessor :gem_spec
+
+  # Tasks from the Bones gem directory
+  attr_reader :bones_files
+
+  # Create a GEM Package task library.  Automatically define the gem
+  # if a block is given.  If no block is supplied, then +define+
+  # needs to be called to define the task.
+  #
+  def initialize(gem_spec)
+    init(gem_spec)
+    yield self if block_given?
+    define if block_given?
+  end
+
+  # Initialization tasks without the "yield self" or define
+  # operations.
+  #
+  def init(gem)
+    super(gem.name, gem.version)
+    @gem_spec = gem
+    @package_files += gem_spec.files if gem_spec.files
+    @bones_files = []
+
+    local_setup = File.join(Dir.pwd, %w[tasks setup.rb])
+    if !test(?e, local_setup)
+      Dir.glob(::Bones.path(%w[lib bones tasks *])).each {|fn| bones_files << fn}
+      gem_spec.files = (gem_spec.files +
+          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
+    end
+  end
+
+  # Create the Rake tasks and actions specified by this
+  # GemPackageTask.  (+define+ is automatically called if a block is
+  # given to +new+).
+  #
+  def define
+    super
+    task :prereqs
+    task :package => ['gem:prereqs', "#{package_dir_path}/#{gem_file}"]
+    file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files + bones_files do
+      when_writing("Creating GEM") {
+        chdir(package_dir_path) do
+          Gem::Builder.new(gem_spec).build
+          verbose(true) {
+            mv gem_file, "../#{gem_file}"
+          }
+        end
+      }
+    end
+
+    file package_dir_path => bones_files do
+      mkdir_p package_dir rescue nil
+      bones_files.each do |fn|
+        base_fn = File.join('tasks', File.basename(fn))
+        f = File.join(package_dir_path, base_fn)
+        fdir = File.dirname(f)
+        mkdir_p(fdir) if !File.exist?(fdir)
+        if File.directory?(fn)
+          mkdir_p(f)
+        else
+          raise "file name conflict for '#{base_fn}' (conflicts with '#{fn}')" if test(?e, f)
+          safe_ln(fn, f)
+        end
+      end
+    end
+  end
+  
+  def gem_file
+    if @gem_spec.platform == Gem::Platform::RUBY
+      "#{package_name}.gem"
+    else
+      "#{package_name}-#{@gem_spec.platform}.gem"
+    end
+  end
+end  # class GemPackageTask
+end  # module Bones
 
 namespace :gem do
 
@@ -19,6 +105,10 @@ namespace :gem do
       s.add_dependency(*dep)
     end
 
+    PROJ.gem.development_dependencies.each do |dep|
+      s.add_development_dependency(*dep)
+    end
+
     s.files = PROJ.gem.files
     s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)}
     s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/
@@ -57,37 +147,14 @@ namespace :gem do
     end
   end  # Gem::Specification.new
 
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  desc 'Show information about the gem'
-  task :debug => 'gem:prereqs' do
-    puts PROJ.gem._spec.to_ruby
-  end
-
-  pkg = Rake::PackageTask.new(PROJ.name, PROJ.version) do |pkg|
+  Bones::GemPackageTask.new(PROJ.gem._spec) do |pkg|
     pkg.need_tar = PROJ.gem.need_tar
     pkg.need_zip = PROJ.gem.need_zip
-    pkg.package_files += PROJ.gem._spec.files
   end
-  Rake::Task['gem:package'].instance_variable_set(:@full_comment, nil)
-
-  gem_file = if PROJ.gem._spec.platform == Gem::Platform::RUBY
-      "#{pkg.package_name}.gem"
-    else
-      "#{pkg.package_name}-#{PROJ.gem._spec.platform}.gem"
-    end
 
-  desc "Build the gem file #{gem_file}"
-  task :package => ['gem:prereqs', "#{pkg.package_dir}/#{gem_file}"]
-
-  file "#{pkg.package_dir}/#{gem_file}" => [pkg.package_dir] + PROJ.gem._spec.files do
-    when_writing("Creating GEM") {
-      Gem::Builder.new(PROJ.gem._spec).build
-      verbose(true) {
-        mv gem_file, "#{pkg.package_dir}/#{gem_file}"
-      }
-    }
+  desc 'Show information about the gem'
+  task :debug => 'gem:prereqs' do
+    puts PROJ.gem._spec.to_ruby
   end
 
   desc 'Install the gem'
@@ -113,14 +180,13 @@ namespace :gem do
   task :cleanup do
     sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
   end
-
 end  # namespace :gem
 
+
 desc 'Alias to gem:package'
 task :gem => 'gem:package'
 
 task :clobber => 'gem:clobber_package'
-
-remove_desc_for_task %w(gem:clobber_package)
+remove_desc_for_task 'gem:clobber_package'
 
 # EOF

data/tasks/manifest.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 require 'find'
 
@@ -15,9 +14,9 @@ namespace :manifest do
       lines.map! do |line|
         case line
         when %r/^(-{3}|\+{3})/; nil
-        when %r/^@/; Console::ANSICode.blue line
-        when %r/^\+/; Console::ANSICode.green line
-        when %r/^\-/; Console::ANSICode.red line
+        when %r/^@/; ANSICode.blue line
+        when %r/^\+/; ANSICode.green line
+        when %r/^\-/; ANSICode.red line
         else line end
       end
     end

data/tasks/post_load.rake

@@ -1,16 +1,15 @@
-# $Id$
 
 # This file does not define any rake tasks. It is used to load some project
 # settings if they are not defined by the user.
 
 PROJ.rdoc.exclude << "^#{Regexp.escape(PROJ.manifest_file)}$"
-PROJ.exclude << ["^#{Regexp.escape(PROJ.ann.file)}$",
-                 "^#{Regexp.escape(PROJ.rdoc.dir)}/",
+PROJ.exclude << ["^#{Regexp.escape(PROJ.rdoc.dir)}/",
                  "^#{Regexp.escape(PROJ.rcov.dir)}/"]
 
 flatten_arrays = lambda do |this,os|
     os.instance_variable_get(:@table).each do |key,val|
-      next if key == :dependencies
+      next if key == :dependencies \
+           or key == :development_dependencies
       case val
       when Array; val.flatten!
       when OpenStruct; this.call(this,val)

data/tasks/rdoc.rake

@@ -7,7 +7,7 @@ namespace :doc do
   desc 'Generate RDoc documentation'
   Rake::RDocTask.new do |rd|
     rdoc = PROJ.rdoc
-    rd.main = rdoc.main
+    rd.main = rdoc.main || PROJ.readme_file
     rd.rdoc_dir = rdoc.dir
 
     incl = Regexp.new(rdoc.include.join('|'))
@@ -22,9 +22,6 @@ namespace :doc do
 
     title = "#{PROJ.name}-#{PROJ.version} Documentation"
 
-    rf_name = PROJ.rubyforge.name
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
-
     rd.options << "-t #{title}"
     rd.options.concat(rdoc.opts)
   end

data/tasks/rubyforge.rake

@@ -6,7 +6,7 @@ require 'rake/contrib/sshpublisher'
 
 namespace :gem do
   desc 'Package and upload to RubyForge'
-  task :release => [:clobber, 'gem:package'] do |t|
+  task :release => [:clobber, 'gem'] do |t|
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
     pkg = "pkg/#{PROJ.gem._spec.full_name}"
@@ -26,9 +26,7 @@ namespace :gem do
     c['release_changes'] = PROJ.changes if PROJ.changes
     c['preformatted'] = true
 
-    files = [(PROJ.gem.need_tar ? "#{pkg}.tgz" : nil),
-             (PROJ.gem.need_zip ? "#{pkg}.zip" : nil),
-             "#{pkg}.gem"].compact
+    files = Dir.glob("#{pkg}*.*")
 
     puts "Releasing #{PROJ.name} v. #{PROJ.version}"
     rf.add_release PROJ.rubyforge.name, PROJ.name, PROJ.version, *files

data/tasks/setup.rb

@@ -18,7 +18,7 @@ PROJ = OpenStruct.new(
   :email => nil,
   :url => "\000",
   :version => ENV['VERSION'] || '0.0.0',
-  :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git ^pkg/),
+  :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/),
   :release_name => ENV['RELEASE'],
 
   # System Defaults
@@ -28,26 +28,10 @@ PROJ = OpenStruct.new(
   :manifest_file => 'Manifest.txt',
   :readme_file => 'README.rdoc',
 
-  # Announce
-  :ann => OpenStruct.new(
-    :file => 'announcement.txt',
-    :text => nil,
-    :paragraphs => [],
-    :email => {
-      :from     => nil,
-      :to       => %w(ruby-talk@ruby-lang.org),
-      :server   => 'localhost',
-      :port     => 25,
-      :domain   => ENV['HOSTNAME'],
-      :acct     => nil,
-      :passwd   => nil,
-      :authtype => :plain
-    }
-  ),
-
   # Gem Packaging
   :gem => OpenStruct.new(
     :dependencies => [],
+    :development_dependencies => [],
     :executables => nil,
     :extensions => FileList['ext/**/extconf.rb'],
     :files => nil,
@@ -66,9 +50,7 @@ PROJ = OpenStruct.new(
   # Rcov
   :rcov => OpenStruct.new(
     :dir => 'coverage',
-    :opts => %w[--sort coverage -T],
-    :threshold => 90.0,
-    :threshold_exact => false
+    :opts => %w[--sort coverage -T --no-html]
   ),
 
   # Rdoc
@@ -86,32 +68,19 @@ PROJ = OpenStruct.new(
     :name => "\000"
   ),
 
-  # Rspec
-  :spec => OpenStruct.new(
-    :files => FileList['spec/**/*_spec.rb'],
-    :opts => []
-  ),
-
-  # Subversion Repository
-  :svn => OpenStruct.new(
-    :root => nil,
-    :path => '',
-    :trunk => 'trunk',
-    :tags => 'tags',
-    :branches => 'branches'
-  ),
-
   # Test::Unit
   :test => OpenStruct.new(
-    :files => FileList['test/**/test_*.rb'],
+    :files => FileList['test/**/*_test.rb'],
     :file  => 'test/all.rb',
     :opts  => []
   )
 )
 
 # Load the other rake files in the tasks folder
-rakefiles = Dir.glob('tasks/*.rake').sort
-rakefiles.unshift(rakefiles.delete('tasks/post_load.rake')).compact!
+tasks_dir = File.expand_path(File.dirname(__FILE__))
+post_load_fn = File.join(tasks_dir, 'post_load.rake')
+rakefiles = Dir.glob(File.join(tasks_dir, '*.rake')).sort
+rakefiles.unshift(rakefiles.delete(post_load_fn)).compact!
 import(*rakefiles)
 
 # Setup the project libraries

data/test/acts_as_markdown_test.rb

@@ -32,6 +32,11 @@ class ActsAsMarkdownTest < ActsAsMarkupTestCase
       should "return formatted html for a `to_html` method call on the column value" do
         assert_match(/<h2(\s\w+\=['"]\w*['"])*\s*>\s*Markdown Test Text\s*<\/h2>/, @post.body.to_html)
       end
+    
+      should "not return escaped html" do
+        @post.body = "## Markdown <i>Test</i> Text"
+        assert_match(/<i>Test<\/i>/, @post.body.to_html)
+      end
 
       context "changing value of markdown field should return new markdown object" do
         setup do
@@ -62,6 +67,20 @@ class ActsAsMarkdownTest < ActsAsMarkupTestCase
         Post.delete_all
       end
     end
+    
+    context 'using RDiscount with options' do
+      setup do
+        class ::Post
+          acts_as_markdown :body, :markdown_options => [ :filter_html ]
+        end
+        @post = Post.new(:title => 'Blah')
+      end
+      
+      should "return escaped html because of :filter_html" do
+        @post.body = "## Markdown <i>Test</i> Text"
+        assert_match(/&lt;i>Test&lt;\/i>/, @post.body.to_html)
+      end
+    end
 
     context 'using Ruby PEG Markdown' do
       setup do
@@ -89,6 +108,11 @@ class ActsAsMarkdownTest < ActsAsMarkupTestCase
       should "return formated html for a `to_html` method call on the column value" do
         assert_match(/<h2(\s\w+\=['"]\w*['"])*\s*>\s*Markdown Test Text\s*<\/h2>/, @post.body.to_html)
       end
+    
+      should "not return escaped html" do
+        @post.body = "## Markdown <i>Test</i> Text"
+        assert_match(/<i>Test<\/i>/, @post.body.to_html)
+      end
 
       context "changing value of markdown field should return new markdown object" do
         setup do
@@ -120,6 +144,20 @@ class ActsAsMarkdownTest < ActsAsMarkupTestCase
       end
     end
 
+    context 'using Ruby PEG Markdown with options' do
+      setup do
+        class ::Post
+          acts_as_markdown :body, :markdown_options => [ :filter_html ]
+        end
+        @post = Post.new(:title => 'Blah')
+      end
+      
+      should "return no html because of :filter_html" do
+        @post.body = "## Markdown <i>Test</i> Text"
+        assert_match(/Markdown Test Text/, @post.body.to_html)
+      end
+    end
+
     context 'using BlueCloth' do
       setup do
         ActsAsMarkup.markdown_library = :bluecloth
@@ -146,6 +184,11 @@ class ActsAsMarkdownTest < ActsAsMarkupTestCase
       should "return formated html for a `to_html` method call on the column value" do
         assert_match(/<h2(\s\w+\=['"]\w*['"])*\s*>\s*Markdown Test Text\s*<\/h2>/, @post.body.to_html)
       end
+    
+      should "not return escaped html" do
+        @post.body = "## Markdown <i>Test</i> Text"
+        assert_match(/<i>Test<\/i>/, @post.body.to_html)
+      end
 
       context "changing value of markdown field should return new markdown object" do
         setup do
@@ -177,6 +220,20 @@ class ActsAsMarkdownTest < ActsAsMarkupTestCase
       end
     end
     
+    context 'using BlueCloth with options' do
+      setup do
+        class ::Post
+          acts_as_markdown :body, :markdown_options => [ :filter_html ]
+        end
+        @post = Post.new(:title => 'Blah')
+      end
+      
+      should "return escaped html because of :filter_html" do
+        @post.body = "## Markdown <i>Test</i> Text"
+        assert_match(/&lt;i&gt;Test&lt;\/i&gt;/, @post.body.to_html)
+      end
+    end
+    
     context 'using Maruku' do
       setup do
         ActsAsMarkup.markdown_library = :maruku

data/test/acts_as_textile_test.rb

@@ -25,6 +25,11 @@ class ActsAsTextileTest < ActsAsMarkupTestCase
     should "return formated html for a `to_html` method call on the column value" do
       assert_match(/<h2>Textile Test Text<\/h2>/, @post.body.to_html)
     end
+    
+    should "not return escaped html" do
+      @post.body = "h2. Textile <i>Test</i> Text"
+      assert_match(/<i>Test<\/i>/, @post.body.to_html)
+    end
   
     context "changing value of textile field should return new textile object" do
       setup do
@@ -55,4 +60,18 @@ class ActsAsTextileTest < ActsAsMarkupTestCase
       Post.delete_all
     end
   end
+  
+  context 'acts_as_textile with options' do
+    setup do
+      class ::Post
+        acts_as_textile :body, :textile_options => [ [ :filter_html ] ]
+      end
+      @post = Post.new(:title => 'Blah')
+    end
+    
+    should "return escaped html because of :filter_html" do
+      @post.body = "h2. Textile <i>Test</i> Text"
+      assert_match(/&lt;i&gt;Test&lt;\/i&gt;/, @post.body.to_html)
+    end
+  end
 end

data/test/acts_as_wikitext_test.rb

@@ -25,6 +25,11 @@ class ActsAsWikitextTest < ActsAsMarkupTestCase
     should "return formated html for a `to_html` method call on the column value" do
       assert_match(/<h2>Wikitext Test Text<\/h2>/, @post.body.to_html)
     end
+    
+    should "not underscore spaces in URLs" do
+      @post.body = "[[foo bar]]"
+      assert_match(/<a href="\/wiki\/foo%20bar">foo bar<\/a>/, @post.body.to_html)
+    end
   
     context "changing value of wikitext field should return new wikitext object" do
       setup do
@@ -55,4 +60,18 @@ class ActsAsWikitextTest < ActsAsMarkupTestCase
       Post.delete_all
     end
   end
+  
+  context 'acts_as_wikitext with options' do
+    setup do
+      class ::Post
+        acts_as_wikitext :body, :wikitext_options => [ { :space_to_underscore => true } ]
+      end
+      @post = Post.new(:title => 'Blah')
+    end
+    
+    should "underscore spaces in URLs because of :space_to_underscore" do
+      @post.body = "[[foo bar]]"
+      assert_match(/<a href="\/wiki\/foo_bar">foo bar<\/a>/, @post.body.to_html)
+    end
+  end
 end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'rubygems'
+gem 'sqlite3-ruby'
 require 'shoulda'
 require 'active_support'
 require 'active_support/test_case'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vigetlabs-acts_as_markup
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors: 
 - Brian Landau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-30 00:00:00 -07:00
+date: 2008-11-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.1
+        version: 2.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.1
+        version: 2.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rdiscount
@@ -37,7 +37,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
+        version: 1.2.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 4.0.3
+        version: 4.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: wikitext