acts_as_markup 1.3.0 → 1.3.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 1.3.1 / 2008-04-27
+* Update rake tasks and way RDoc is generated
+* Ensure works with Rails 2.3.2 and latest version of related markup gems.
+
 == 1.3.0 / 2008-11-19
 * Add ability to accept options that will be passed to supported markup parsers. (chewi[http://github.com/chewi/])
 

data/Rakefile

@@ -24,6 +24,10 @@ PROJ.rcov.opts = ['--no-html', '-T', '--sort coverage',
                   '-x "\/System\/Library\/"']
 PROJ.rcov.pattern = 'test/**/*_test.rb'
 
-%W(activesupport activerecord rdiscount RedCloth wikitext).each  do |gem|
-  depend_on gem
-end
+PROJ.gem.development_dependencies << ['voloko-sdoc', '~> 0.2.12']
+PROJ.gem.development_dependencies << ['thoughtbot-shoulda', '~> 2.0']
+depend_on 'activesupport', '~> 2.3.1'
+depend_on 'activerecord', '~> 2.3.1'
+depend_on 'activerecord', '~> 1.3'
+depend_on 'wikitext', '~> 1.5'
+depend_on 'RedCloth', '~> 4.1'

data/acts_as_markup.gemspec

@@ -1,10 +1,12 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{acts_as_markup}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Landau"]
-  s.date = %q{2008-11-19}
+  s.date = %q{2009-04-27}
   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,32 +16,38 @@ 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.3.1}
+  s.rubygems_version = %q{1.3.2}
   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"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 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"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 2.3.1"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.1"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 1.3"])
+      s.add_runtime_dependency(%q<wikitext>, ["~> 1.5"])
+      s.add_runtime_dependency(%q<RedCloth>, ["~> 4.1"])
+      s.add_development_dependency(%q<voloko-sdoc>, ["~> 0.2.12"])
+      s.add_development_dependency(%q<thoughtbot-shoulda>, ["~> 2.0"])
     else
-      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"])
+      s.add_dependency(%q<activesupport>, ["~> 2.3.1"])
+      s.add_dependency(%q<activerecord>, ["~> 2.3.1"])
+      s.add_dependency(%q<activerecord>, ["~> 1.3"])
+      s.add_dependency(%q<wikitext>, ["~> 1.5"])
+      s.add_dependency(%q<RedCloth>, ["~> 4.1"])
+      s.add_dependency(%q<voloko-sdoc>, ["~> 0.2.12"])
+      s.add_dependency(%q<thoughtbot-shoulda>, ["~> 2.0"])
     end
   else
-    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"])
+    s.add_dependency(%q<activesupport>, ["~> 2.3.1"])
+    s.add_dependency(%q<activerecord>, ["~> 2.3.1"])
+    s.add_dependency(%q<activerecord>, ["~> 1.3"])
+    s.add_dependency(%q<wikitext>, ["~> 1.5"])
+    s.add_dependency(%q<RedCloth>, ["~> 4.1"])
+    s.add_dependency(%q<voloko-sdoc>, ["~> 0.2.12"])
+    s.add_dependency(%q<thoughtbot-shoulda>, ["~> 2.0"])
   end
 end

data/lib/acts_as_markup.rb

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

data/lib/acts_as_markup/exts/maruku.rb

@@ -5,25 +5,25 @@ class Maruku
   
   attr_reader :text
   
-	def initialize(s=nil, meta={})
-		super(nil)
-		self.attributes.merge! meta
-		if s
-		  @text = s
-			parse_doc(s)
-		end
-	end
-	
-	# Used to get the original Markdown text.
-	def to_s
-	  @text
+  def initialize(s=nil, meta={})
+    super(nil)
+    self.attributes.merge! meta
+    if s
+      @text = s
+      parse_doc(s)
+    end
+  end
+  
+  # Used to get the original Markdown text.
+  def to_s
+    @text
   end
   
   # used to be compatable with Rails/ActiveSupport
   def blank?
     @text.blank?
   end
-	
+  
 end
 
 class String
@@ -44,26 +44,26 @@ module MaRuKu # :nodoc:
       # method because we need +to_html+ to return the original text on plain text fields of
       # the variable language option on +acts_as_markup+
       def array_to_html(array)
-    		elements = []
-    		array.each do |item|
-    			method = item.kind_of?(MDElement) ? "to_html_#{item.node_type}" : "to_xml"
+        elements = []
+        array.each do |item|
+          method = item.kind_of?(MDElement) ? "to_html_#{item.node_type}" : "to_xml"
           unless item.respond_to?(method)
-    				next
-    			end
+            next
+          end
 
-    			html_text =  item.send(method)
+          html_text =  item.send(method)
           if html_text.nil?
-    				raise "Nil html created by method  #{method}:\n#{html_text.inspect}\n for object #{item.inspect[0,300]}"
-    			end
+            raise "Nil html created by method  #{method}:\n#{html_text.inspect}\n for object #{item.inspect[0,300]}"
+          end
 
-    			if html_text.kind_of?Array
-    				elements = elements + html_text
-    			else
-    				elements << html_text
-    			end
-    		end
-    		elements
-    	end
+          if html_text.kind_of?Array
+            elements = elements + html_text
+          else
+            elements << html_text
+          end
+        end
+        elements
+      end
 
     end
   end

data/tasks/gem.rake

@@ -37,8 +37,6 @@ class GemPackageTask < Rake::PackageTask
     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
 
@@ -63,6 +61,10 @@ class GemPackageTask < Rake::PackageTask
 
     file package_dir_path => bones_files do
       mkdir_p package_dir rescue nil
+      
+      gem_spec.files = (gem_spec.files +
+          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
+      
       bones_files.each do |fn|
         base_fn = File.join('tasks', File.basename(fn))
         f = File.join(package_dir_path, base_fn)
@@ -156,6 +158,13 @@ namespace :gem do
   task :debug => 'gem:prereqs' do
     puts PROJ.gem._spec.to_ruby
   end
+  
+  desc 'Write the gemspec '
+  task :spec => 'gem:prereqs' do
+    File.open("#{PROJ.name}.gemspec", 'w') do |f|
+      f.write PROJ.gem._spec.to_ruby
+    end
+  end
 
   desc 'Install the gem'
   task :install => [:clobber, 'gem:package'] do

data/tasks/manifest.rake

@@ -26,7 +26,7 @@ namespace :manifest do
 
   desc 'Create a new manifest'
   task :create do
-    files = manifest_files
+    files = manifest
     unless test(?f, PROJ.manifest_file)
       files << PROJ.manifest_file
       files.sort!

data/tasks/post_load.rake

@@ -24,12 +24,7 @@ PROJ.description ||= paragraphs_of(PROJ.readme_file, 'description').join("\n\n")
 
 PROJ.summary ||= PROJ.description.split('.').first
 
-PROJ.gem.files ||=
-  if test(?f, PROJ.manifest_file)
-    files = File.readlines(PROJ.manifest_file).map {|fn| fn.chomp.strip}
-    files.delete ''
-    files
-  else [] end
+PROJ.gem.files ||= manifest
 
 PROJ.gem.executables ||= PROJ.gem.files.find_all {|fn| fn =~ %r/^bin/}
 

data/tasks/rdoc.rake

@@ -1,5 +1,6 @@
 # $Id$
 
+require 'sdoc'
 require 'rake/rdoctask'
 
 namespace :doc do
@@ -21,8 +22,9 @@ namespace :doc do
     rd.rdoc_files.push(*files)
 
     title = "#{PROJ.name}-#{PROJ.version} Documentation"
-
-    rd.options << "-t #{title}"
+    
+    rd.template = 'direct'
+    rd.options << "-t #{title} --fmt shtml"
     rd.options.concat(rdoc.opts)
   end
 

data/tasks/setup.rb

@@ -5,8 +5,9 @@ require 'rake'
 require 'rake/clean'
 require 'fileutils'
 require 'ostruct'
+require 'find'
 
-class OpenStruct; undef :gem; end
+class OpenStruct; undef :gem if defined? :gem; end 
 
 PROJ = OpenStruct.new(
   # Project Defaults
@@ -27,6 +28,7 @@ PROJ = OpenStruct.new(
   :history_file => 'CHANGELOG',
   :manifest_file => 'Manifest.txt',
   :readme_file => 'README.rdoc',
+  :ignore_file => '.gitignore',
 
   # Gem Packaging
   :gem => OpenStruct.new(
@@ -87,9 +89,7 @@ import(*rakefiles)
 %w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
 
 # Setup some constants
-WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
-
-DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
+DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'
 
 def quiet( &block )
   io = [STDOUT.dup, STDERR.dup]
@@ -102,21 +102,15 @@ ensure
   $stdout, $stderr = STDOUT, STDERR
 end
 
-DIFF = if WIN32 then 'diff.exe'
-       else
-         if quiet {system "gdiff", __FILE__, __FILE__} then 'gdiff'
-         else 'diff' end
-       end unless defined? DIFF
+DIFF = if system("gdiff '#{__FILE__}' '#{__FILE__}' > #{DEV_NULL} 2>&1") then 'gdiff'
+       else 'diff' end unless defined? DIFF
 
-SUDO = if WIN32 then ''
-       else
-         if quiet {system 'which sudo'} then 'sudo'
-         else '' end
-       end
+SUDO = if system("which sudo > #{DEV_NULL} 2>&1") then 'sudo'
+       else '' end unless defined? SUDO
 
-RCOV = WIN32 ? 'rcov.bat' : 'rcov'
-RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
-GEM  = WIN32 ? 'gem.bat'  : 'gem'
+RCOV = "#{RUBY} -S rcov"
+RDOC = "#{RUBY} -S rdoc"
+GEM  = "#{RUBY} -S gem"
 
 %w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
   begin
@@ -212,9 +206,30 @@ end
 # Scans the current working directory and creates a list of files that are
 # candidates to be in the manifest.
 #
-def manifest_files
+def manifest
   files = []
-  exclude = Regexp.new(PROJ.exclude.join('|'))
+  exclude = PROJ.exclude.dup
+  comment = %r/^\s*#/
+  exclude << Regexp.escape(PROJ.ignore_file)
+ 
+  # process the ignore file and add the items there to the exclude list
+  if test(?f, PROJ.ignore_file)
+    ary = []
+    File.readlines(PROJ.ignore_file).each do |line|
+      next if line =~ comment
+      line.chomp!
+      line.strip!
+      next if line.nil? or line.empty?
+
+      glob = line =~ %r/\*\./ ? File.join('**', line) : line
+      Dir.glob(glob).each {|fn| ary << "^#{Regexp.escape(fn)}"}
+    end
+    exclude.concat ary
+  end
+
+  # generate a regular expression from the exclude list
+  exclude = Regexp.new(exclude.join('|'))
+  
   Find.find '.' do |path|
     path.sub! %r/^(\.\/|\/)/o, ''
     next unless test ?f, path

data/test/acts_as_wikitext_test.rb

@@ -26,11 +26,11 @@ class ActsAsWikitextTest < ActsAsMarkupTestCase
       assert_match(/<h2>Wikitext Test Text<\/h2>/, @post.body.to_html)
     end
     
-    should "not underscore spaces in URLs" do
+    should "underscore spaces in URLs" do
       @post.body = "[[foo bar]]"
-      assert_match(/<a href="\/wiki\/foo%20bar">foo bar<\/a>/, @post.body.to_html)
+      assert_match(/<a href="\/wiki\/foo_bar">foo bar<\/a>/, @post.body.to_html)
     end
-  
+    
     context "changing value of wikitext field should return new wikitext object" do
       setup do
         @old_body = @post.body
@@ -64,14 +64,14 @@ class ActsAsWikitextTest < ActsAsMarkupTestCase
   context 'acts_as_wikitext with options' do
     setup do
       class ::Post
-        acts_as_wikitext :body, :wikitext_options => [ { :space_to_underscore => true } ]
+        acts_as_wikitext :body, :wikitext_options => [ { :space_to_underscore => false } ]
       end
       @post = Post.new(:title => 'Blah')
     end
     
-    should "underscore spaces in URLs because of :space_to_underscore" do
+    should "not underscore spaces in URLs because of :space_to_underscore option" do
       @post.body = "[[foo bar]]"
-      assert_match(/<a href="\/wiki\/foo_bar">foo bar<\/a>/, @post.body.to_html)
+      assert_match(/<a href="\/wiki\/foo%20bar">foo bar<\/a>/, @post.body.to_html)
     end
   end
 end

data/test/test_helper.rb

@@ -5,6 +5,7 @@ require 'shoulda'
 require 'active_support'
 require 'active_support/test_case'
 require File.expand_path( File.join(File.dirname(__FILE__), %w[.. lib acts_as_markup]) )
+ActiveRecord::Schema.verbose = false
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_markup
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Brian Landau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-19 00:00:00 -05:00
+date: 2009-04-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.2.1
+        version: 2.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -28,39 +28,59 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.2.1
+        version: 2.3.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: activerecord
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.11
+        version: "1.3"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: wikitext
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 4.1.0
+        version: "1.5"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: wikitext
+  name: RedCloth
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "4.1"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: voloko-sdoc
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 0.2.12
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.0"
     version: 
 description: Represent ActiveRecord Markdown, Textile, Wiki text, RDoc columns as Markdown, Textile Wikitext, RDoc objects using various external libraries to convert to HTML.
 email: brian.landau@viget.com
@@ -105,6 +125,8 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://viget.rubyforge.com/acts_as_markup
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -126,9 +148,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: viget
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Represent ActiveRecord Markdown, Textile, Wiki text, RDoc columns as Markdown, Textile Wikitext, RDoc objects using various external libraries to convert to HTML
 test_files: 
 - test/acts_as_markdown_test.rb