acts_as_markup 1.1.2 → 1.2.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 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/])
+* Other Minor bug fixes
+
 == 1.1.2 / 2008-08-22
 * Make sure all markup objects properly respond to the .blank? method call.
 

data/Manifest.txt

@@ -7,11 +7,12 @@ 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/string.rb
 lib/acts_as_markup/exts/wikitext.rb
+lib/acts_as_markup/stringlike.rb
 tasks/bones.rake
 tasks/gem.rake
 tasks/git.rake

data/acts_as_markup.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = %q{acts_as_markup}
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Landau"]
-  s.date = %q{2008-08-22}
+  s.date = %q{2008-09-10}
   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/peg_markdown.rb", "lib/acts_as_markup/exts/rdiscount.rb", "lib/acts_as_markup/exts/rdoc.rb", "lib/acts_as_markup/exts/string.rb", "lib/acts_as_markup/exts/wikitext.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.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.homepage = %q{http://viget.rubyforge.com/acts_as_markup}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -23,23 +23,23 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if current_version >= 3 then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.1.0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.1.0"])
-      s.add_runtime_dependency(%q<rdiscount>, [">= 1.2.7.1"])
+      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"])
-      s.add_runtime_dependency(%q<wikitext>, [">= 1.1.1"])
+      s.add_runtime_dependency(%q<wikitext>, [">= 1.2"])
     else
-      s.add_dependency(%q<activesupport>, [">= 2.1.0"])
-      s.add_dependency(%q<activerecord>, [">= 2.1.0"])
-      s.add_dependency(%q<rdiscount>, [">= 1.2.7.1"])
+      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<wikitext>, [">= 1.1.1"])
+      s.add_dependency(%q<wikitext>, [">= 1.2"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 2.1.0"])
-    s.add_dependency(%q<activerecord>, [">= 2.1.0"])
-    s.add_dependency(%q<rdiscount>, [">= 1.2.7.1"])
+    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<wikitext>, [">= 1.1.1"])
+    s.add_dependency(%q<wikitext>, [">= 1.2"])
   end
 end

data/lib/acts/as_markup.rb

@@ -76,7 +76,7 @@ module ActiveRecord # :nodoc:
             rdoc_klass = 'RDocText'
             options[:language_column] ||= :markup_language
           else
-            raise ActsAsMarkup::UnsportedMarkupLanguage, "#{options[:langauge]} is not a currently supported markup language."
+            raise ActsAsMarkup::UnsupportedMarkupLanguage, "#{options[:langauge]} is not a currently supported markup language."
           end
           
           options[:columns].each do |col|

data/lib/acts_as_markup.rb

@@ -2,20 +2,20 @@ require 'active_support'
 
 module ActsAsMarkup
   # :stopdoc:
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
   
   # This exception is raised when an unsupported markup language is supplied to acts_as_markup.
-  class UnsportedMarkupLanguage < ArgumentError
+  class UnsupportedMarkupLanguage < ArgumentError
   end
   
   # This exception is raised when an unsupported Markdown library is set to the config value.
   class UnsportedMarkdownLibrary < ArgumentError
   end
   
-  DEFAULT_MAKRDOWN_LIB = :rdiscount
+  DEFAULT_MARKDOWN_LIB = :rdiscount
   
   MARKDOWN_LIBS = { :rdiscount => {:class_name => "RDiscount",
                                    :lib_name   => "rdiscount"}, 
@@ -28,7 +28,7 @@ module ActsAsMarkup
                                    
   LIBRARY_EXTENSIONS = Set.new(Dir[ActsAsMarkup::LIBPATH + 'acts_as_markup/exts/*.rb'].map {|file| File.basename(file, '.rb')}).delete('string')
   
-  @@markdown_library = DEFAULT_MAKRDOWN_LIB
+  @@markdown_library = DEFAULT_MARKDOWN_LIB
   mattr_accessor :markdown_library
   
   # :stopdoc:
@@ -39,14 +39,14 @@ module ActsAsMarkup
   end
 
   # Returns the library path for the module. If any arguments are given,
-  # they will be joined to the end of the libray path using
+  # they will be joined to the end of the library path using
   # <tt>File.join</tt>.
   #
   def self.libpath( *args )
     args.empty? ? LIBPATH : ::File.join(LIBPATH, *args)
   end
 
-  # Returns the lpath for the module. If any arguments are given,
+  # Returns the path for the module. If any arguments are given,
   # they will be joined to the end of the path using
   # <tt>File.join</tt>.
   #
@@ -70,5 +70,6 @@ module ActsAsMarkup
 
 end  # module ActsAsMarkup
 
-require 'acts_as_markup/exts/string'
+require 'acts_as_markup/exts/object'
+require 'acts_as_markup/stringlike'
 ActsAsMarkup.require_all_libs_relative_to __FILE__, 'acts'

data/lib/acts_as_markup/exts/maruku.rb

@@ -1,6 +1,8 @@
 require 'maruku'
 
 class Maruku
+  include Stringlike
+  
   attr_reader :text
   
 	def initialize(s=nil, meta={})

data/lib/acts_as_markup/exts/object.rb

@@ -0,0 +1 @@
+Object.send :alias_method, :to_html, :to_s

data/lib/acts_as_markup/exts/peg_markdown.rb

@@ -1,6 +1,8 @@
 require 'peg_markdown'
 
 class PEGMarkdown
+  include Stringlike
+  
   # used to be compatable with Rails/ActiveSupport
   def blank?
     self.text.blank?

data/lib/acts_as_markup/exts/rdiscount.rb

@@ -1,6 +1,8 @@
 require 'rdiscount'
 
 class RDiscount
+  include Stringlike
+  
   # Used to get the original Markdown text.
   def to_s
     self.text

data/lib/acts_as_markup/stringlike.rb

@@ -0,0 +1,7 @@
+# This mixin allows our markup objects (like RDiscount or RedCloth) to have
+# all the normal string methods that are available.
+module Stringlike
+  def method_missing(method, *params)
+    self.to_s.send(method, *params)
+  end
+end

data/test/acts_as_markdown_test.rb

@@ -14,6 +14,8 @@ class ActsAsMarkdownTest < ActsAsMarkupTestCase
         end
         @post = Post.create!(:title => 'Blah', :body => @markdown_text)
       end
+      
+      should_act_like_a_string
 
       should "have a RDiscount object returned for the column value" do
         assert_kind_of RDiscount, @post.body
@@ -27,7 +29,7 @@ class ActsAsMarkdownTest < ActsAsMarkupTestCase
         assert !@post.body.blank?
       end
 
-      should "return formated html for a `to_html` method call on the column value" do
+      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
 
@@ -69,6 +71,8 @@ class ActsAsMarkdownTest < ActsAsMarkupTestCase
         end
         @post = Post.create!(:title => 'Blah', :body => @markdown_text)
       end
+      
+      should_act_like_a_string
 
       should "have a Ruby PEG Markdown object returned for the column value" do
         assert_kind_of PEGMarkdown, @post.body
@@ -124,6 +128,8 @@ class ActsAsMarkdownTest < ActsAsMarkupTestCase
         end
         @post = Post.create!(:title => 'Blah', :body => @markdown_text)
       end
+      
+      should_act_like_a_string
 
       should "have a BlueCloth object returned for the column value" do
         assert_kind_of BlueCloth, @post.body
@@ -179,6 +185,8 @@ class ActsAsMarkdownTest < ActsAsMarkupTestCase
         end
         @post = Post.create!(:title => 'Blah', :body => @markdown_text)
       end
+      
+      should_act_like_a_string
 
       should "have a Maruku object returned for the column value" do
         assert_kind_of Maruku, @post.body

data/test/acts_as_markup_test.rb

@@ -7,7 +7,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
   
   context 'acts_as_markup' do
     setup do
-      ActsAsMarkup.markdown_library = ActsAsMarkup::DEFAULT_MAKRDOWN_LIB
+      ActsAsMarkup.markdown_library = ActsAsMarkup::DEFAULT_MARKDOWN_LIB
       
       @textile_text = "h2. Textile Test Text"
       class ::TextilePost < ActiveRecord::Base
@@ -76,7 +76,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
   
   context 'acts_as_markup with variable language' do
     setup do
-      ActsAsMarkup.markdown_library = ActsAsMarkup::DEFAULT_MAKRDOWN_LIB
+      ActsAsMarkup.markdown_library = ActsAsMarkup::DEFAULT_MARKDOWN_LIB
       class ::VariablePost < ActiveRecord::Base
         acts_as_markup :language => :variable, :columns => [:body]
       end
@@ -325,7 +325,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
   
   context 'acts_as_markup with variable language setting the language column' do
     setup do
-      ActsAsMarkup.markdown_library = ActsAsMarkup::DEFAULT_MAKRDOWN_LIB
+      ActsAsMarkup.markdown_library = ActsAsMarkup::DEFAULT_MARKDOWN_LIB
       class ::VariableLanguagePost < ActiveRecord::Base
         acts_as_markup :language => :variable, :columns => [:body], :language_column => :language_name
       end
@@ -567,7 +567,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
   
   context 'acts_as_markup with bad language name' do
     should 'raise exception when a non-supported language is passed to acts_as_markup' do
-      assert_raise ActsAsMarkup::UnsportedMarkupLanguage do
+      assert_raise ActsAsMarkup::UnsupportedMarkupLanguage do
         class ::Post < ActiveRecord::Base
           acts_as_markup :language => :fake, :columns => [:body]
         end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'rubygems'
 require 'shoulda'
 require 'active_support'
 require 'active_support/test_case'
@@ -56,4 +57,11 @@ class ActsAsMarkupTestCase < ActiveSupport::TestCase
   def teardown
     teardown_db
   end
+  
+  def self.should_act_like_a_string
+    should "act like a string" do
+      assert_equal @post.body.split(' '), ['##', 'Markdown', 'Test', 'Text']
+      assert @post.body.match(/Te[sx]t/)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_markup
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors: 
 - Brian Landau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-22 00:00:00 -04:00
+date: 2008-09-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rdiscount
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.7.1
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: "1.2"
     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
@@ -82,11 +82,12 @@ files:
 - 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/string.rb
 - lib/acts_as_markup/exts/wikitext.rb
+- lib/acts_as_markup/stringlike.rb
 - tasks/bones.rake
 - tasks/gem.rake
 - tasks/git.rake

data/lib/acts_as_markup/exts/string.rb

@@ -1 +0,0 @@
-String.send :alias_method, :to_html, :to_s