Merge pull request #57 from github/3-2-github+builder-3.2

Bump to builder 3.2

Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: git://github.com/fxn/sdoc.git
+  revision: 9977ca4ecf83a76d637861f79319b11830d51de5
+  specs:
+    sdoc (0.3.19)
+      json (>= 1.1.3)
+      rdoc (~> 3.10)
+
 PATH
   remote: .
   specs:
@@ -7,7 +15,7 @@ PATH
     actionpack (3.2.17)
       activemodel (= 3.2.17)
       activesupport (= 3.2.17)
-      builder (~> 3.0.0)
+      builder (~> 3.2)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.5)
@@ -16,7 +24,7 @@ PATH
       sprockets (~> 2.2.1)
     activemodel (3.2.17)
       activesupport (= 3.2.17)
-      builder (~> 3.0.0)
+      builder (~> 3.2)
     activerecord (3.2.17)
       activemodel (= 3.2.17)
       activesupport (= 3.2.17)
@@ -47,10 +55,11 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    RedCloth (4.2.9)
     arel (3.0.3)
     bcrypt-ruby (3.0.1)
     benchmark-ips (1.2.0)
-    builder (3.0.4)
+    builder (3.2.2)
     erubis (2.7.0)
     execjs (2.0.2)
     hike (1.2.3)
@@ -99,12 +108,16 @@ GEM
     uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    w3c_validators (1.2)
+      json
+      nokogiri
     yajl-ruby (1.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  RedCloth (~> 4.2)
   arel
   bcrypt-ruby (~> 3.0.0)
   benchmark-ips
@@ -118,6 +131,8 @@ DEPENDENCIES
   pg (>= 0.11.0)
   rails!
   rake (>= 0.8.7)
+  sdoc!
   sqlite3 (~> 1.3.5)
   uglifier (>= 1.0.3)
+  w3c_validators
   yajl-ruby

actionpack/actionpack.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activesupport', version)
   s.add_dependency('activemodel',   version)
   s.add_dependency('rack-cache',    '~> 1.2')
-  s.add_dependency('builder',       '~> 3.0.0')
+  s.add_dependency('builder',       '~> 3.2')
   s.add_dependency('rack',          '~> 1.4.5')
   s.add_dependency('rack-test',     '~> 0.6.1')
   s.add_dependency('journey',       '~> 1.0.4')

activemodel/activemodel.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.add_dependency('activesupport', version)
-  s.add_dependency('builder',       '~> 3.0.0')
+  s.add_dependency('builder',       '~> 3.2')
 end