acts_as_markup 1.2.0 → 1.2.1

data/Rakefile

@@ -19,6 +19,11 @@ 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"',
+                  '-x "\/System\/Library\/"']
+PROJ.rcov.pattern = 'test/**/*_test.rb'
 
 %W(activesupport activerecord rdiscount RedCloth wikitext).each  do |gem|
   depend_on gem

data/acts_as_markup.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{acts_as_markup}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Landau"]
-  s.date = %q{2008-09-10}
+  s.date = %q{2008-09-30}
   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"]
@@ -27,19 +27,19 @@ Gem::Specification.new do |s|
       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.2"])
+      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<wikitext>, [">= 1.2"])
+      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<wikitext>, [">= 1.2"])
+    s.add_dependency(%q<wikitext>, [">= 1.2.1"])
   end
 end

data/lib/acts/as_markup.rb

@@ -49,31 +49,13 @@ module ActiveRecord # :nodoc:
         # 
         def acts_as_markup(options)
           case options[:language].to_sym
-          when :markdown
-            klass = get_markdown_class
-          when :textile
-            require 'redcloth'
-            klass = 'RedCloth'
-          when :wikitext
-            require 'wikitext'
-            require_extensions 'wikitext'
-            klass = 'WikitextString'
-          when :rdoc
-            require 'rdoc/markup/simple_markup'
-            require 'rdoc/markup/simple_markup/to_html'
-            require_extensions 'rdoc'
-            klass = 'RDocText'
+          when :markdown, :textile, :wikitext, :rdoc
+            klass = require_library_and_get_class(options[:language].to_sym)
           when :variable
-            markdown_klass = get_markdown_class
-            require 'redcloth'
-            require 'wikitext'
-            require 'rdoc/markup/simple_markup'
-            require 'rdoc/markup/simple_markup/to_html'
-            require_extensions 'wikitext'
-            require_extensions 'rdoc'
-            textile_klass = 'RedCloth'
-            wiki_klass = 'WikitextString'
-            rdoc_klass = 'RDocText'
+            markup_klasses = {}
+            [:textile, :wikitext, :rdoc, :markdown].each do |language|
+              markup_klasses[language] = require_library_and_get_class(language)
+            end
             options[:language_column] ||= :markup_language
           else
             raise ActsAsMarkup::UnsupportedMarkupLanguage, "#{options[:langauge]} is not a currently supported markup language."
@@ -101,13 +83,13 @@ module ActiveRecord # :nodoc:
                   end
                   case self.#{options[:language_column].to_s}
                   when /markdown/i
-                    @#{col.to_s} = #{markdown_klass}.new(self['#{col.to_s}'].to_s)
+                    @#{col.to_s} = #{markup_klasses[:markdown]}.new(self['#{col.to_s}'].to_s)
                   when /textile/i
-                    @#{col.to_s} = #{textile_klass}.new(self['#{col.to_s}'].to_s)
+                    @#{col.to_s} = #{markup_klasses[:textile]}.new(self['#{col.to_s}'].to_s)
                   when /wikitext/i
-                    @#{col.to_s} = #{wiki_klass}.new(self['#{col.to_s}'].to_s)
+                    @#{col.to_s} = #{markup_klasses[:wikitext]}.new(self['#{col.to_s}'].to_s)
                   when /rdoc/i
-                    @#{col.to_s} = #{rdoc_klass}.new(self['#{col.to_s}'].to_s)
+                    @#{col.to_s} = #{markup_klasses[:rdoc]}.new(self['#{col.to_s}'].to_s)
                   else
                     @#{col.to_s} = self['#{col.to_s}']
                   end
@@ -163,6 +145,27 @@ module ActiveRecord # :nodoc:
               require "acts_as_markup/exts/#{library.to_s}"
             end
           end
+          
+          def require_library_and_get_class(language)
+            case language
+            when :markdown
+              return get_markdown_class
+            when :textile
+              require 'redcloth'
+              return 'RedCloth'
+            when :wikitext
+              require 'wikitext'
+              require_extensions 'wikitext'
+              return 'WikitextString'
+            when :rdoc
+              require 'rdoc/markup/simple_markup'
+              require 'rdoc/markup/simple_markup/to_html'
+              require_extensions 'rdoc'
+              return 'RDocText'
+            else
+              return 'String'
+            end
+          end
         
       end
     end

data/lib/acts_as_markup.rb

@@ -2,7 +2,7 @@ require 'active_support'
 
 module ActsAsMarkup
   # :stopdoc:
-  VERSION = '1.2.0'
+  VERSION = '1.2.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

@@ -44,30 +44,25 @@ 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)
-    		e = []
-    		array.each do |c|
-    			method = c.kind_of?(MDElement) ? 
-    			   "to_html_#{c.node_type}" : "to_xml"
-
-    			if not c.respond_to?(method)
-    				#raise "Object does not answer to #{method}: #{c.class} #{c.inspect}"
+    		elements = []
+    		array.each do |item|
+    			method = item.kind_of?(MDElement) ? "to_html_#{item.node_type}" : "to_xml"
+          unless item.respond_to?(method)
     				next
     			end
 
-    			h =  c.send(method)
-
-    			if h.nil?
-    				raise "Nil html created by method  #{method}:\n#{h.inspect}\n"+
-    				" for object #{c.inspect[0,300]}"
+    			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
 
-    			if h.kind_of?Array
-    				e = e + h #h.each do |hh| e << hh end
+    			if html_text.kind_of?Array
+    				elements = elements + html_text
     			else
-    				e << h
+    				elements << html_text
     			end
     		end
-    		e
+    		elements
     	end
 
     end

data/tasks/test.rake

@@ -1,4 +1,7 @@
 require 'rake/testtask'
+if HAVE_RCOV
+  require 'rcov/rcovtask'
+end
 
 namespace :test do
 
@@ -12,17 +15,9 @@ namespace :test do
 
   if HAVE_RCOV
     desc 'Run rcov on the unit tests'
-    task :rcov => :clobber_rcov do
-      opts = PROJ.rcov.opts.dup << '-o' << PROJ.rcov.dir
-      opts = opts.join(' ')
-      files = if test(?f, PROJ.test.file) then [PROJ.test.file]
-              else PROJ.test.files end
-      files = files.join(' ')
-      sh "#{RCOV} #{files} #{opts}"
-    end
-
-    task :clobber_rcov do
-      rm_r 'coverage' rescue nil
+    Rcov::RcovTask.new do |t|
+      t.pattern = PROJ.rcov.pattern
+      t.rcov_opts = PROJ.rcov.opts
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_markup
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Brian Landau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 -04:00
+date: 2008-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.2"
+        version: 1.2.1
     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