acts_as_markup 1.0.0 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 1.1.0 / 2008-08-12
+
+* Use a default for markup language column name when the variable options is used.
+
 == 1.0.0 / 2008-08-11
 
 * Add support for Maruku Markdown Library.

data/README.rdoc

@@ -87,7 +87,7 @@ By default RDiscount will be used.
 ==== Using +acts_as_markup+ with <tt>:variable</tt> language:
 
     class Post < ActiveRecrod
-      acts_as_markup :language => :variable, :columns => [:body], :language_column => 'markup_language'
+      acts_as_markup :language => :variable, :columns => [:body]
     end
     
     @post = Post.find(:first)

data/Rakefile

@@ -13,7 +13,7 @@ PROJ.name = 'acts_as_markup'
 PROJ.authors = 'Brian Landau'
 PROJ.email = 'brian.landau@viget.com'
 PROJ.url = 'http://viget.rubyforge.com/acts_as_markup'
-PROJ.description = "Represent ActiveRecord Markdown, Textile, or Wiki text columns as Markdown, Textile or Wikitext objects using various external libraries to convert to HTML."
+PROJ.description = "Represent ActiveRecord Markdown, Textile, Wiki text, RDoc columns as Markdown, Textile Wikitext, RDoc objects using various external libraries to convert to HTML."
 PROJ.rubyforge.name = 'viget'
 PROJ.version = ActsAsMarkup::VERSION
 PROJ.rdoc.include = %w(^lib/ LICENSE CHANGELOG README\.rdoc)

data/acts_as_markup.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name = %q{acts_as_markup}
-  s.version = "1.0.0"
+  s.version = "1.1.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-11}
-  s.description = %q{Represent ActiveRecord Markdown, Textile, or Wiki text columns as Markdown, Textile or Wikitext objects using various external libraries to convert to HTML.}
+  s.date = %q{2008-08-12}
+  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/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"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{viget}
   s.rubygems_version = %q{1.2.0}
-  s.summary = %q{Represent ActiveRecord Markdown, Textile, or Wiki text columns as Markdown, Textile or Wikitext objects using various external libraries to convert to HTML}
+  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

data/lib/acts/as_markup.rb

@@ -13,12 +13,13 @@ module ActiveRecord # :nodoc:
         # Markdown, Textile, Wikitext or RDoc content.
         # Then you can simply call <tt>.to_html</tt> method on the attribute.
         # 
-        # You can also specify the language as <tt>:variable</tt> you will then
-        # need to add an additional option of <tt>:language_column</tt>. When 
-        # a value is accessed it will create 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 also specify the language as <tt>:variable</tt>. The language used
+        # to process the column will be based on another column. By default a column
+        # named "<tt>markup_language</tt>" is used, but this can be changed by providing 
+        # a <tt>:language_column</tt> option. When a value is accessed it will create 
+        # 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.
         # 
         # 
         # ==== Examples
@@ -37,11 +38,11 @@ module ActiveRecord # :nodoc:
         # ===== Using variable language
         # 
         #     class Post < ActiveRecrod
-        #       acts_as_markup :language => :variable, :columns => [:body], :language_column => 'markup_language'
+        #       acts_as_markup :language => :variable, :columns => [:body], :language_column => 'language_name'
         #     end
         #     
         #     @post = Post.find(:first)
-        #     @post.markup_language      # => "markdown"
+        #     @post.language_name        # => "markdown"
         #     @post.body.to_s            # => "## Markdown Headline"
         #     @post.body.to_html         # => "<h2> Markdown Headline</h2>"
         #     
@@ -73,6 +74,7 @@ module ActiveRecord # :nodoc:
             textile_klass = 'RedCloth'
             wiki_klass = 'WikitextString'
             rdoc_klass = 'RDocText'
+            options[:language_column] ||= :markup_language
           else
             raise ActsAsMarkup::UnsportedMarkupLanguage, "#{options[:langauge]} is not a currently supported markup language."
           end

data/lib/acts_as_markup.rb

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

data/test/acts_as_markup_test.rb

@@ -78,7 +78,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
     setup do
       ActsAsMarkup.markdown_library = ActsAsMarkup::DEFAULT_MAKRDOWN_LIB
       class ::VariablePost < ActiveRecord::Base
-        acts_as_markup :language => :variable, :columns => [:body], :language_column => :markup_language
+        acts_as_markup :language => :variable, :columns => [:body]
       end
     end
     
@@ -323,6 +323,28 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
     end
   end
   
+  context 'acts_as_markup with variable language setting the language column' do
+    setup do
+      ActsAsMarkup.markdown_library = ActsAsMarkup::DEFAULT_MAKRDOWN_LIB
+      class ::VariableLanguagePost < ActiveRecord::Base
+        acts_as_markup :language => :variable, :columns => [:body], :language_column => :language_name
+      end
+    end
+    
+    should "use the correct language column" do
+      markdown_text = '## Markdown Test Text'
+      markdown_post = VariableLanguagePost.create!(:title => 'Blah', :body => markdown_text, :language_name => 'Markdown')
+      
+      assert_kind_of RDiscount, markdown_post.body
+      assert_equal markdown_text, markdown_post.body.to_s
+      assert_match(/<h2(\s\w+\=['"]\w*['"])*\s*>\s*Markdown Test Text\s*<\/h2>/, markdown_post.body.to_html)
+    end
+    
+    teardown do
+      VariableLanguagePost.delete_all
+    end
+  end
+  
   context 'with a nil value for the text' do
     setup do
       @text = nil

data/test/test_helper.rb

@@ -32,6 +32,13 @@ def setup_db
       t.column :markup_language, :string
       t.timestamps
     end
+    
+    create_table :variable_language_posts do |t|
+      t.column :title, :string
+      t.column :body, :text
+      t.column :language_name, :string
+      t.timestamps
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_markup
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Brian Landau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-11 00:00:00 -04:00
+date: 2008-08-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.1
     version: 
-description: Represent ActiveRecord Markdown, Textile, or Wiki text columns as Markdown, Textile or Wikitext objects using various external libraries to convert to HTML.
+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
 executables: []
 
@@ -127,7 +127,7 @@ rubyforge_project: viget
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Represent ActiveRecord Markdown, Textile, or Wiki text columns as Markdown, Textile or Wikitext objects using various external libraries to convert to HTML
+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
 - test/acts_as_markup_test.rb