acts_as_markup 1.4.0 → 1.4.1

data/Gemfile

@@ -12,6 +12,7 @@ group :development do
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
   gem 'sqlite3-ruby'
+  gem 'sdoc'
   gem 'brianjlandau-sdoc-helpers', :require => 'sdoc_helpers'
   gem 'rpeg-markdown'
   gem 'rdoc'

data/Gemfile.lock

@@ -2,20 +2,20 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.8)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+    activemodel (3.1.2)
+      activesupport (= 3.1.2)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    activerecord (3.1.2)
+      activemodel (= 3.1.2)
+      activesupport (= 3.1.2)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activesupport (3.1.1)
+    activesupport (3.1.2)
       multi_json (~> 1.0)
     arel (2.2.1)
     bluecloth (2.2.0)
-    brianjlandau-sdoc-helpers (0.1.4)
+    brianjlandau-sdoc-helpers (0.1.5)
     builder (3.0.0)
     expression_parser (0.9.0)
     git (1.2.5)
@@ -35,6 +35,9 @@ GEM
       json (~> 1.4)
     redcarpet (1.17.2)
     rpeg-markdown (1.4.6)
+    sdoc (0.3.16)
+      json (>= 1.1.3)
+      rdoc (~> 3.10)
     shoulda (2.11.3)
     sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
@@ -63,6 +66,7 @@ DEPENDENCIES
   rdoc
   redcarpet
   rpeg-markdown
+  sdoc
   shoulda
   sqlite3-ruby
   wikicloth

data/README.rdoc

@@ -21,7 +21,7 @@ is listed as "markdown" "textile", "mediawiki" or "rdoc" (case insensitive) it w
 treat it as such, any other value for markup language will have the value pass 
 through as a normal string.
 
-This AR extension can use 3 different types of Markdown processing backends: 
+This AR extension can use 5 different types of Markdown processing backends: 
 BlueCloth, RDiscount, Ruby PEG, Redcarpet or Maruku. You specify which one you want to use by setting
 a config value in your environment.rb file:
 
@@ -137,11 +137,21 @@ The four options currently supported are:
 
 == INSTALL:
 
-<tt>sudo gem install acts_as_markup</tt>
+==== Rails 2
+
+<tt>(sudo) gem install acts_as_markup</tt>
  
 Add "+acts_as_markup+" to your environment.rb:
 
     config.gem "acts_as_markup"
+    
+==== Rails 3
+
+Simply add "+acts_as_markup+" to your Gemfile:
+
+    gem "acts_as_markup"
+
+And run "+bundle+ +install+"
 
 == CONTRIBUTING:
 

data/acts_as_markup.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{acts_as_markup}
-  s.version = "1.4.0"
+  s.name = "acts_as_markup"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Brian Landau}]
-  s.date = %q{2011-11-17}
-  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.authors = ["Brian Landau"]
+  s.date = "2012-03-09"
+  s.description = "Represent ActiveRecord Markdown, Textile, Wiki text, RDoc columns as Markdown, Textile Wikitext, RDoc objects using various external libraries to convert to HTML."
+  s.email = "brian.landau@viget.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -47,11 +47,11 @@ Gem::Specification.new do |s|
     "test/acts_as_textile_test.rb",
     "test/test_helper.rb"
   ]
-  s.homepage = %q{http://vigetlabs.github.com/acts_as_markup/}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  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.homepage = "http://vigetlabs.github.com/acts_as_markup/"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.15"
+  s.summary = "Represent ActiveRecord Markdown, Textile, Wiki text, RDoc columns as Markdown, Textile Wikitext, RDoc objects using various external libraries to convert to HTML."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<sdoc>, [">= 0"])
       s.add_development_dependency(%q<brianjlandau-sdoc-helpers>, [">= 0"])
       s.add_development_dependency(%q<rpeg-markdown>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
@@ -90,6 +91,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<sdoc>, [">= 0"])
       s.add_dependency(%q<brianjlandau-sdoc-helpers>, [">= 0"])
       s.add_dependency(%q<rpeg-markdown>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
@@ -114,6 +116,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<sdoc>, [">= 0"])
     s.add_dependency(%q<brianjlandau-sdoc-helpers>, [">= 0"])
     s.add_dependency(%q<rpeg-markdown>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])

data/lib/acts_as_markup/railtie.rb

@@ -4,8 +4,8 @@ module ActsAsMarkup
     
     initializer 'acts_as_markup.set_config', :after => 'active_record.initialize_database' do |app|
       ActiveSupport.on_load(:acts_as_markup) do
-        self.markdown_library = app.config.acts_as_makrup.markdown_library
-        self.mediawiki_library = app.config.acts_as_makrup.mediawiki_library
+        self.markdown_library = app.config.acts_as_markup.markdown_library
+        self.mediawiki_library = app.config.acts_as_markup.mediawiki_library
       end
     end
     
@@ -19,8 +19,8 @@ module ActsAsMarkup
     end
     
     config.before_configuration do
-      config.acts_as_makrup.markdown_library = :rdiscount
-      config.acts_as_makrup.mediawiki_library = :wikicloth
+      config.acts_as_markup['markdown_library'] ||= :rdiscount
+      config.acts_as_markup['mediawiki_library'] ||= :wikicloth
     end
   end
 end

data/lib/acts_as_markup/version.rb

@@ -1,3 +1,3 @@
 module ActsAsMarkup
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/tasks/rdoc.rb

@@ -1,4 +1,6 @@
+require 'sdoc'
 require 'rake/sdoctask'
+require 'sdoc_helpers/pages'
 
 Rake::SDocTask.new do |rdoc|
   version = ActsAsMarkup::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_markup
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000Z
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2162216420 !ruby/object:Gem::Requirement
+  requirement: &70355753253080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162216420
+  version_requirements: *70355753253080
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2162215920 !ruby/object:Gem::Requirement
+  requirement: &70355753248560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162215920
+  version_requirements: *70355753248560
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2162215440 !ruby/object:Gem::Requirement
+  requirement: &70355753260320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162215440
+  version_requirements: *70355753260320
 - !ruby/object:Gem::Dependency
   name: wikicloth
-  requirement: &2162214960 !ruby/object:Gem::Requirement
+  requirement: &70355753256440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162214960
+  version_requirements: *70355753256440
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2162214460 !ruby/object:Gem::Requirement
+  requirement: &70355753270280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162214460
+  version_requirements: *70355753270280
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2162213960 !ruby/object:Gem::Requirement
+  requirement: &70355753268020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162213960
+  version_requirements: *70355753268020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2162213460 !ruby/object:Gem::Requirement
+  requirement: &70355753266020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2162213460
+  version_requirements: *70355753266020
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2162212980 !ruby/object:Gem::Requirement
+  requirement: &70355753263680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2162212980
+  version_requirements: *70355753263680
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2162212480 !ruby/object:Gem::Requirement
+  requirement: &70355753274760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162212480
+  version_requirements: *70355753274760
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2162211980 !ruby/object:Gem::Requirement
+  requirement: &70355753273680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162211980
+  version_requirements: *70355753273680
+- !ruby/object:Gem::Dependency
+  name: sdoc
+  requirement: &70355753272780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70355753272780
 - !ruby/object:Gem::Dependency
   name: brianjlandau-sdoc-helpers
-  requirement: &2162211420 !ruby/object:Gem::Requirement
+  requirement: &70355753271620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162211420
+  version_requirements: *70355753271620
 - !ruby/object:Gem::Dependency
   name: rpeg-markdown
-  requirement: &2162210940 !ruby/object:Gem::Requirement
+  requirement: &70355753287340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162210940
+  version_requirements: *70355753287340
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2162210420 !ruby/object:Gem::Requirement
+  requirement: &70355753286640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162210420
+  version_requirements: *70355753286640
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &2162209900 !ruby/object:Gem::Requirement
+  requirement: &70355753285800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162209900
+  version_requirements: *70355753285800
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &2162209420 !ruby/object:Gem::Requirement
+  requirement: &70355753284240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162209420
+  version_requirements: *70355753284240
 - !ruby/object:Gem::Dependency
   name: wikitext
-  requirement: &2162208920 !ruby/object:Gem::Requirement
+  requirement: &70355753294520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162208920
+  version_requirements: *70355753294520
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2162208400 !ruby/object:Gem::Requirement
+  requirement: &70355753290600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162208400
+  version_requirements: *70355753290600
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2162207880 !ruby/object:Gem::Requirement
+  requirement: &70355753287680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +219,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2162207880
+  version_requirements: *70355753287680
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2162207360 !ruby/object:Gem::Requirement
+  requirement: &70355753303180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +230,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2162207360
+  version_requirements: *70355753303180
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2162206780 !ruby/object:Gem::Requirement
+  requirement: &70355753301840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,10 +241,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2162206780
+  version_requirements: *70355753301840
 - !ruby/object:Gem::Dependency
   name: wikitext
-  requirement: &2162206300 !ruby/object:Gem::Requirement
+  requirement: &70355753300840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -241,10 +252,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162206300
+  version_requirements: *70355753300840
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2162205660 !ruby/object:Gem::Requirement
+  requirement: &70355753300120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -252,7 +263,7 @@ dependencies:
         version: '4.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2162205660
+  version_requirements: *70355753300120
 description: Represent ActiveRecord Markdown, Textile, Wiki text, RDoc columns as
   Markdown, Textile Wikitext, RDoc objects using various external libraries to convert
   to HTML.
@@ -307,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2289890828287220338
+      hash: 2949024107638452918
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -316,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Represent ActiveRecord Markdown, Textile, Wiki text, RDoc columns as Markdown,