acts_as_markup 1.3.2 → 1.3.3

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 1.3.3 / 2009-06-11
+* Maintenance release
+
+== 1.3.2 / 2009-04-28
+* Maintenance release
+
 == 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.

data/Rakefile

@@ -24,10 +24,10 @@ PROJ.rcov.opts = ['--no-html', '-T', '--sort coverage',
                   '-x "\/System\/Library\/"']
 PROJ.rcov.pattern = 'test/**/*_test.rb'
 
-PROJ.gem.development_dependencies << ['mislav-hanna', '~> 0.1']
 PROJ.gem.development_dependencies << ['thoughtbot-shoulda', '~> 2.0']
-depend_on 'activesupport', '~> 2.3.1'
-depend_on 'activerecord', '~> 2.3.1'
+PROJ.gem.development_dependencies << ['bones', '~> 2.5']
+depend_on 'activesupport', '~> 2.3.2'
+depend_on 'activerecord', '~> 2.3.2'
 depend_on 'rdiscount', '~> 1.3'
 depend_on 'wikitext', '~> 1.5'
-depend_on 'RedCloth', '~> 4.1'
+depend_on 'RedCloth', '~> 4.2'

data/acts_as_markup.gemspec

@@ -2,21 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_markup}
-  s.version = "1.3.2"
+  s.version = "1.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Landau"]
-  s.date = %q{2009-04-28}
+  s.date = %q{2009-06-11}
   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"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "acts_as_markup.gemspec", "lib/acts/as_markup.rb", "lib/acts_as_markup.rb", "lib/acts_as_markup/exts/maruku.rb", "lib/acts_as_markup/exts/object.rb", "lib/acts_as_markup/exts/peg_markdown.rb", "lib/acts_as_markup/exts/rdiscount.rb", "lib/acts_as_markup/exts/rdoc.rb", "lib/acts_as_markup/exts/wikitext.rb", "lib/acts_as_markup/stringlike.rb", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/manifest.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/test.rake", "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", "test/test_helper.rb"]
-  s.has_rdoc = true
+  s.files = ["CHANGELOG", "LICENSE", "README.rdoc", "Rakefile", "acts_as_markup.gemspec", "lib/acts/as_markup.rb", "lib/acts_as_markup.rb", "lib/acts_as_markup/exts/maruku.rb", "lib/acts_as_markup/exts/object.rb", "lib/acts_as_markup/exts/peg_markdown.rb", "lib/acts_as_markup/exts/rdiscount.rb", "lib/acts_as_markup/exts/rdoc.rb", "lib/acts_as_markup/exts/wikitext.rb", "lib/acts_as_markup/stringlike.rb", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/test.rake", "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", "test/test_helper.rb"]
   s.homepage = %q{http://viget.rubyforge.com/acts_as_markup}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{viget}
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.4}
   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"]
 
@@ -25,29 +24,29 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 2.3.1"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.1"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 2.3.2"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.2"])
       s.add_runtime_dependency(%q<rdiscount>, ["~> 1.3"])
       s.add_runtime_dependency(%q<wikitext>, ["~> 1.5"])
-      s.add_runtime_dependency(%q<RedCloth>, ["~> 4.1"])
-      s.add_development_dependency(%q<mislav-hanna>, ["~> 0.1"])
+      s.add_runtime_dependency(%q<RedCloth>, ["~> 4.2"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, ["~> 2.0"])
+      s.add_development_dependency(%q<bones>, ["~> 2.5"])
     else
-      s.add_dependency(%q<activesupport>, ["~> 2.3.1"])
-      s.add_dependency(%q<activerecord>, ["~> 2.3.1"])
+      s.add_dependency(%q<activesupport>, ["~> 2.3.2"])
+      s.add_dependency(%q<activerecord>, ["~> 2.3.2"])
       s.add_dependency(%q<rdiscount>, ["~> 1.3"])
       s.add_dependency(%q<wikitext>, ["~> 1.5"])
-      s.add_dependency(%q<RedCloth>, ["~> 4.1"])
-      s.add_dependency(%q<mislav-hanna>, ["~> 0.1"])
+      s.add_dependency(%q<RedCloth>, ["~> 4.2"])
       s.add_dependency(%q<thoughtbot-shoulda>, ["~> 2.0"])
+      s.add_dependency(%q<bones>, ["~> 2.5"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["~> 2.3.1"])
-    s.add_dependency(%q<activerecord>, ["~> 2.3.1"])
+    s.add_dependency(%q<activesupport>, ["~> 2.3.2"])
+    s.add_dependency(%q<activerecord>, ["~> 2.3.2"])
     s.add_dependency(%q<rdiscount>, ["~> 1.3"])
     s.add_dependency(%q<wikitext>, ["~> 1.5"])
-    s.add_dependency(%q<RedCloth>, ["~> 4.1"])
-    s.add_dependency(%q<mislav-hanna>, ["~> 0.1"])
+    s.add_dependency(%q<RedCloth>, ["~> 4.2"])
     s.add_dependency(%q<thoughtbot-shoulda>, ["~> 2.0"])
+    s.add_dependency(%q<bones>, ["~> 2.5"])
   end
 end

data/lib/acts_as_markup.rb

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

data/tasks/post_load.rake

@@ -2,7 +2,6 @@
 # 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.rdoc.dir)}/",
                  "^#{Regexp.escape(PROJ.rcov.dir)}/"]
 

data/tasks/rdoc.rake

@@ -1,6 +1,7 @@
 # $Id$
 
-require 'hanna/rdoctask'
+require 'sdoc'
+require 'rake/rdoctask'
 
 namespace :doc do
 
@@ -23,6 +24,8 @@ namespace :doc do
     title = "#{PROJ.name}-#{PROJ.version} Documentation"
     
     rd.options << "-t #{title}"
+    rd.options << '--fmt' << 'shtml' # explictly set shtml generator
+    rd.template = 'direct'
     rd.options.concat(rdoc.opts)
   end
 

data/tasks/setup.rb

@@ -26,7 +26,6 @@ PROJ = OpenStruct.new(
   :ruby_opts => %w(-w),
   :libs => [],
   :history_file => 'CHANGELOG',
-  :manifest_file => 'Manifest.txt',
   :readme_file => 'README.rdoc',
   :ignore_file => '.gitignore',
 
@@ -112,7 +111,7 @@ RCOV = "#{RUBY} -S rcov"
 RDOC = "#{RUBY} -S rdoc"
 GEM  = "#{RUBY} -S gem"
 
-%w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
+%w(rcov rubyforge bones facets/ansicode).each do |lib|
   begin
     require lib
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}
@@ -120,8 +119,6 @@ GEM  = "#{RUBY} -S gem"
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", false}
   end
 end
-HAVE_SVN = (Dir.entries(Dir.pwd).include?('.svn') and
-            system("svn --version 2>&1 > #{DEV_NULL}"))
 HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and
             system("git --version 2>&1 > #{DEV_NULL}"))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_markup
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - Brian Landau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-28 00:00:00 -04:00
+date: 2009-06-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.3.1
+        version: 2.3.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.3.1
+        version: 2.3.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rdiscount
@@ -60,27 +60,27 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "4.1"
+        version: "4.2"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mislav-hanna
+  name: thoughtbot-shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.1"
+        version: "2.0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: bones
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: "2.5"
     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
@@ -95,7 +95,6 @@ extra_rdoc_files:
 files: 
 - CHANGELOG
 - LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - acts_as_markup.gemspec
@@ -111,7 +110,6 @@ files:
 - tasks/bones.rake
 - tasks/gem.rake
 - tasks/git.rake
-- tasks/manifest.rake
 - tasks/post_load.rake
 - tasks/rdoc.rake
 - tasks/rubyforge.rake
@@ -148,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: viget
-rubygems_version: 1.3.2
+rubygems_version: 1.3.4
 signing_key: 
 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

data/Manifest.txt

@@ -1,30 +0,0 @@
-CHANGELOG
-LICENSE
-Manifest.txt
-README.rdoc
-Rakefile
-acts_as_markup.gemspec
-lib/acts/as_markup.rb
-lib/acts_as_markup.rb
-lib/acts_as_markup/exts/maruku.rb
-lib/acts_as_markup/exts/object.rb
-lib/acts_as_markup/exts/peg_markdown.rb
-lib/acts_as_markup/exts/rdiscount.rb
-lib/acts_as_markup/exts/rdoc.rb
-lib/acts_as_markup/exts/wikitext.rb
-lib/acts_as_markup/stringlike.rb
-tasks/bones.rake
-tasks/gem.rake
-tasks/git.rake
-tasks/manifest.rake
-tasks/post_load.rake
-tasks/rdoc.rake
-tasks/rubyforge.rake
-tasks/setup.rb
-tasks/test.rake
-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
-test/test_helper.rb

data/tasks/manifest.rake

@@ -1,48 +0,0 @@
-
-require 'find'
-
-namespace :manifest do
-
-  desc 'Verify the manifest'
-  task :check do
-    fn = PROJ.manifest_file + '.tmp'
-    files = manifest_files
-
-    File.open(fn, 'w') {|fp| fp.puts files}
-    lines = %x(#{DIFF} -du #{PROJ.manifest_file} #{fn}).split("\n")
-    if HAVE_FACETS_ANSICODE and ENV.has_key?('TERM')
-      lines.map! do |line|
-        case line
-        when %r/^(-{3}|\+{3})/; nil
-        when %r/^@/; ANSICode.blue line
-        when %r/^\+/; ANSICode.green line
-        when %r/^\-/; ANSICode.red line
-        else line end
-      end
-    end
-    puts lines.compact
-    rm fn rescue nil
-  end
-
-  desc 'Create a new manifest'
-  task :create do
-    files = manifest
-    unless test(?f, PROJ.manifest_file)
-      files << PROJ.manifest_file
-      files.sort!
-    end
-    File.open(PROJ.manifest_file, 'w') {|fp| fp.puts files}
-  end
-
-  task :assert do
-    files = manifest_files
-    manifest = File.read(PROJ.manifest_file).split($/)
-    raise "ERROR: #{PROJ.manifest_file} is out of date" unless files == manifest
-  end
-
-end  # namespace :manifest
-
-desc 'Alias to manifest:check'
-task :manifest => 'manifest:check'
-
-# EOF