r509 0.8.1 → 0.9

data/Rakefile

@@ -5,34 +5,37 @@ require "#{File.dirname(__FILE__)}/lib/r509/version"
 task :default => :spec
 RSpec::Core::RakeTask.new(:spec)
 
-desc 'Run all rspec tests with rcov (1.8 only)'
-RSpec::Core::RakeTask.new(:rcov) do |t|
-    t.rcov_opts =  %q[--exclude "spec,gems"]
-    t.rcov = true
-end
-
-
 namespace :gem do
-    desc 'Build the gem'
-    task :build do
-        puts `yard`
-        puts `gem build r509.gemspec`
-    end
-
-    desc 'Install gem'
-    task :install do
-        puts `gem install r509-#{R509::VERSION}.gem`
-    end
+  desc 'Build the gem'
+  task :build do
+    puts `yard`
+    puts `gem build r509.gemspec`
+  end
+
+  desc 'Install gem'
+  task :install do
+    puts `gem install r509-#{R509::VERSION}.gem`
+  end
+
+  desc 'Uninstall gem'
+  task :uninstall do
+    puts `gem uninstall r509`
+  end
+end
 
-    desc 'Uninstall gem'
-    task :uninstall do
-        puts `gem uninstall r509`
-    end
+desc "Open an irb session with the lib dir included"
+task :irb do
+  $:.unshift File.expand_path("../../lib", __FILE__)
+  $:.unshift File.expand_path("../", __FILE__)
+  require 'r509'
+  require 'irb'
+  ARGV.clear
+  IRB.start
 end
 
 
 desc 'Build yard documentation'
 task :yard do
-    puts `yard`
-    `open doc/index.html`
+  puts `yard`
+  `open doc/index.html`
 end

data/bin/r509

@@ -1,143 +1,157 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require 'rubygems'
 require 'r509'
-require 'r509/version'
-require 'openssl'
 require 'trollop'
 
 opts = Trollop::options do
-    opt :interactive, "Interactive CSR/self-signed certificate generation. Overrides all flags other than keyout and out."
-    opt :subject, "X509 subject / delimited. Example: /CN=test.com/O=Org/C=US/ST=Illinois/L=Chicago", :type => :string
-    opt :message_digest, "Message digest to use. sha1, sha256, sha512, md5", :type => :string, :default => 'sha1'
-    opt :duration, "Self-sign the certificate with the duration (in days) specified.", :type => :integer
-    opt :bits, "Bit length of generated key.", :type => :integer, :default => 2048
-    opt :keyout, "File name to save generated key.", :type => :string
-    opt :out, "File name to save generated CSR or self-signed certificate", :type => :string
-    version "r509 #{R509::VERSION}"
+  opt :interactive, "Interactive CSR/self-signed certificate generation. Overrides all flags other than keyout and out."
+  opt :subject, "X509 subject / delimited. Example: /CN=test.com/O=Org/C=US/ST=Illinois/L=Chicago", :type => :string
+  opt :message_digest, "Message digest to use. sha1, sha224, sha256, sha384, sha512, md5", :type => :string, :default => 'sha1'
+  opt :duration, "Self-sign the certificate with the duration (in days) specified.", :type => :integer
+  opt :bits, "Bit length of generated key. Ignored for EC.", :type => :integer, :default => 2048
+  opt :curve_name, "Name of elliptic curve to use. Only used for EC.", :type => :string, :default => 'secp384r1'
+  opt :keyout, "File name to save generated key.", :type => :string
+  opt :out, "File name to save generated CSR or self-signed certificate", :type => :string
+  opt :type, "Type of key to generate. RSA/DSA/EC", :type => :string, :default => "RSA"
+  version "r509 #{R509::VERSION}"
 end
 
 if opts[:interactive] == true or opts[:subject].nil? then
+  if opts[:type].upcase == "RSA" or opts[:type].upcase == "DSA"
     print "CSR Bit Strength (2048):"
     bit_strength = gets.chomp
     bit_strength = (bit_strength.to_i > 0)? bit_strength.to_i : 2048
+  elsif opts[:type].upcase == "EC"
+    print "Curve Name (secp384r1):"
+    curve_name = gets.chomp
+    curve_name = (not curve_name.empty?)? curve_name : 'secp384r1'
+  else
+    puts "Invalid key type specified. RSA/DSA/EC"
+    exit
+  end
 
-    print "Message Digest (sha1):"
-    md = gets.chomp
-    md = case md
-        when 'sha1' then 'sha1'
-        when 'sha256' then 'sha256'
-        when 'sha512' then 'sha512'
-        when 'md5' then 'md5'
-        else 'sha1'
-    end
+  print "Message Digest (sha1):"
+  md = gets.chomp
+  opts[:message_digest] = case md
+    when 'sha1' then 'sha1'
+    when 'sha224' then 'sha224'
+    when 'sha256' then 'sha256'
+    when 'sha384' then 'sha384'
+    when 'sha512' then 'sha512'
+    when 'md5' then 'md5'
+    else 'sha1'
+  end
 
-    subject = []
-    print "C (US): "
-    c = gets.chomp
-    c = c.empty? ? 'US':c;
-    subject.push ['C',c]
+  subject = []
+  print "C (US): "
+  c = gets.chomp
+  c = c.empty? ? 'US':c;
+  subject.push ['C',c]
 
-    print "ST (Illinois): "
-    st = gets.chomp
-    st = st.empty? ? 'Illinois':st;
-    subject.push ['ST',st]
+  print "ST (Illinois): "
+  st = gets.chomp
+  st = st.empty? ? 'Illinois':st;
+  subject.push ['ST',st]
 
-    print "L (Chicago): "
-    l = gets.chomp
-    l = l.empty? ? 'Chicago':l;
-    subject.push ['L',l]
+  print "L (Chicago): "
+  l = gets.chomp
+  l = l.empty? ? 'Chicago':l;
+  subject.push ['L',l]
 
-    print "O (r509 LLC): "
-    o = gets.chomp
-    o = o.empty? ? 'r509 LLC':o;
-    subject.push ['O',o]
+  print "O (r509 LLC): "
+  o = gets.chomp
+  o = o.empty? ? 'r509 LLC':o;
+  subject.push ['O',o]
 
-    print "OU (null by default): "
-    ou = gets.chomp
-    if(!ou.empty?) then
-        subject.push ['OU',ou]
-    end
+  print "OU (null by default): "
+  ou = gets.chomp
+  if(!ou.empty?) then
+    subject.push ['OU',ou]
+  end
 
-    print "CN: "
-    subject.push ['CN',gets.chomp]
-    print "SAN Domains (comma separated):"
-    san_domains = []
-    san_domains = gets.chomp.split(',').collect { |domain| domain.strip }
-    csr = R509::Csr.new(
-        :subject => subject,
-        :bit_strength => bit_strength,
-        :san_names => san_domains,
-        :message_digest => md
-    )
+  print "CN: "
+  subject.push ['CN',gets.chomp]
+  print "SAN Domains (comma separated):"
+  san_domains = []
+  san_domains = gets.chomp.split(',').collect { |domain| domain.strip }
+  csr = R509::CSR.new(
+    :subject => subject,
+    :bit_strength => bit_strength,
+    :type => opts[:type].downcase.to_sym,
+    :curve_name => curve_name,
+    :san_names => san_domains,
+    :message_digest => opts[:message_digest]
+  )
 
-    selfsign = 0
-    print "Self-signed cert duration in days (null disables self-sign):"
-    selfsign_input = gets.chomp
-    if selfsign_input.to_i > 0
-        selfsign = selfsign_input.to_i
-    end
+  selfsign = 0
+  print "Self-signed cert duration in days (null disables self-sign):"
+  selfsign_input = gets.chomp
+  if selfsign_input.to_i > 0
+    selfsign = selfsign_input.to_i
+  end
 elsif not opts[:subject].nil?
-    subject = OpenSSL::X509::Name.new
-    opts[:subject].chomp.split('/').each { |item|
-        if item != '' then
-            value = item.split('=')
-            subject.add_entry(value[0],value[1])
-        end
-    }
-    bit_strength = opts[:bits]
-    csr = R509::Csr.new(
-        :subject => subject,
-        :bit_strength => bit_strength,
-        :message_digest => opts[:message_digest]
-    )
-    selfsign = opts[:duration] || 0
+  subject = OpenSSL::X509::Name.new
+  opts[:subject].chomp.split('/').each { |item|
+    if item != '' then
+      value = item.split('=')
+      subject.add_entry(value[0],value[1])
+    end
+  }
+  csr = R509::CSR.new(
+    :subject => subject,
+    :bit_strength => opts[:bits],
+    :type => opts[:type].downcase.to_sym,
+    :curve_name => opts[:curve_name],
+    :message_digest => opts[:message_digest]
+  )
+  selfsign = opts[:duration] || 0
 end
 
 if selfsign > 0
-    ca = R509::CertificateAuthority::Signer.new
-    cert = ca.selfsign(
-        :csr => csr,
-        :not_after => Time.now.to_i+86400*selfsign,
-        :message_digest => opts[:message_digest]
-    )
-    if opts[:keyout].nil?
-        puts csr.key.to_pem
-    else
-        File.open(opts[:keyout], 'w') {|f| f.write(csr.key.to_pem) }
-    end
-    if opts[:out].nil?
-        puts cert.to_pem
-    else
-        File.open(opts[:out], 'w') {|f| f.write(cert.to_pem) }
-    end
+  ca = R509::CertificateAuthority::Signer.new
+  cert = ca.selfsign(
+    :csr => csr,
+    :not_after => Time.now.to_i+86400*selfsign,
+    :message_digest => opts[:message_digest]
+  )
+  if opts[:keyout].nil?
+    puts csr.key.to_pem
+  else
+    File.open(opts[:keyout], 'w') {|f| f.write(csr.key.to_pem) }
+  end
+  if opts[:out].nil?
+    puts cert.to_pem
+  else
+    File.open(opts[:out], 'w') {|f| f.write(cert.to_pem) }
+  end
 
-    puts cert.subject
-    if not cert.san_names.empty?
-        puts "SAN(s): "+cert.san_names.join(", ")
-    end
+  puts cert.subject
+  if not cert.san.nil?
+    puts "SAN(s): "+cert.san.names.map { |n| n.value }.join(", ")
+  end
 else
-    if opts[:keyout].nil?
-        puts csr.key.to_pem
-    else
-        File.open(opts[:keyout], 'w') {|f| f.write(csr.key.to_pem) }
-    end
+  if opts[:keyout].nil?
+    puts csr.key.to_pem
+  else
+    File.open(opts[:keyout], 'w') {|f| f.write(csr.key.to_pem) }
+  end
 
-    if opts[:out].nil?
-        puts csr.to_pem
-    else
-        File.open(opts[:out], 'w') {|f| f.write(csr.to_pem) }
-    end
+  if opts[:out].nil?
+    puts csr.to_pem
+  else
+    File.open(opts[:out], 'w') {|f| f.write(csr.to_pem) }
+  end
 
-    puts csr.subject
-    if not csr.san_names.empty?
-        puts "SAN(s): "+csr.san_names.join(", ")
-    end
+  puts csr.subject
+  if not csr.san.nil?
+    puts "SAN(s): "+csr.san.names.map{|n| n.value}.join(", ")
+  end
 end
 
 if RUBY_PLATFORM.match('darwin') != nil then
-    if selfsign > 0
-        IO.popen('pbcopy','w').puts cert
-    else
-        IO.popen('pbcopy','w').puts csr
-    end
+  if selfsign > 0
+    IO.popen('pbcopy','w').puts cert
+  else
+    IO.popen('pbcopy','w').puts csr
+  end
 end

data/bin/r509-parse

@@ -1,35 +1,35 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require 'rubygems'
 require 'r509'
-require 'r509/version'
-require 'openssl'
 
 if ARGV[0].nil? then
-    puts "CSR and certificate parsing using r509 v#{R509::VERSION}."
-    puts "Usage: r509-parse <cert or csr>"
+  puts "CSR and certificate parsing using r509 v#{R509::VERSION}."
+  puts "Usage: r509-parse <cert or csr>"
 else
+  begin
+    csr = R509::CSR.load_from_file ARGV[0]
+  rescue
+  end
+  if not csr.nil?
+    puts "Subject: #{csr.subject}"
+    puts "Algorithm: #{csr.signature_algorithm}"
+      puts "SAN Names: #{csr.san.names.map { |n| n.value }.join(" , ")}"
+  else
     begin
-        csr = R509::Csr.load_from_file ARGV[0]
+      cert = R509::Cert.load_from_file ARGV[0]
     rescue
     end
-    if not csr.nil?
-        puts "Subject: #{csr.subject}"
-        puts "SAN Names: #{csr.san_names.join(" , ")}"
+    if not cert.nil?
+      puts "Subject: #{cert.subject}"
+      puts "Issuer: #{cert.issuer}"
+      puts "Algorithm: #{cert.signature_algorithm}"
+      puts "SAN Names: #{cert.san.names.map { |n| n.value }.join(" , ")}"
+      puts "Not Before: #{cert.not_before}"
+      puts "Not After: #{cert.not_after}"
+      puts "Serial (Hex): #{cert.hexserial}"
+      puts "Serial (Decimal): #{cert.serial}"
     else
-        begin
-            cert = R509::Cert.load_from_file ARGV[0]
-        rescue
-        end
-        if not cert.nil?
-            puts "Subject: #{cert.subject}"
-            puts "Issuer: #{cert.issuer}"
-            puts "SAN Names: #{cert.san_names.join(" , ")}"
-            puts "Not Before: #{cert.not_before}"
-            puts "Not After: #{cert.not_after}"
-            puts "Serial (Hex): #{cert.serial.to_s(16).upcase}"
-            puts "Serial (Decimal): #{cert.serial}"
-        else
-            puts "Failed to parse CSR or certificate"
-        end
+      puts "Failed to parse CSR or certificate"
     end
+  end
 end

data/doc/R509.html

@@ -6,7 +6,7 @@
 <title>
   Module: R509
   
-    &mdash; Documentation by YARD 0.8.2.1
+    &mdash; Documentation by YARD 0.8.5
   
 </title>
 
@@ -80,7 +80,7 @@
   
     <dt class="r1 last">Defined in:</dt>
     <dd class="r1 last">lib/r509.rb<span class="defines">,<br />
-  lib/r509/csr.rb,<br /> lib/r509/crl.rb,<br /> lib/r509/spki.rb,<br /> lib/r509/cert.rb,<br /> lib/r509/config.rb,<br /> lib/r509/version.rb,<br /> lib/r509/subject.rb,<br /> lib/r509/oidmapper.rb,<br /> lib/r509/privatekey.rb,<br /> lib/r509/exceptions.rb,<br /> lib/r509/io_helpers.rb,<br /> lib/r509/messagedigest.rb,<br /> lib/r509/cert/extensions.rb</span>
+  lib/r509/csr.rb,<br /> lib/r509/crl.rb,<br /> lib/r509/cert.rb,<br /> lib/r509/spki.rb,<br /> lib/r509/asn1.rb,<br /> lib/r509/config.rb,<br /> lib/r509/subject.rb,<br /> lib/r509/version.rb,<br /> lib/r509/oid_mapper.rb,<br /> lib/r509/exceptions.rb,<br /> lib/r509/io_helpers.rb,<br /> lib/r509/private_key.rb,<br /> lib/r509/message_digest.rb,<br /> lib/r509/cert/extensions.rb</span>
 </dd>
   
 </dl>
@@ -102,11 +102,11 @@ support.</p>
 <p class="children">
   
     
-      <strong class="modules">Modules:</strong> <span class='object_link'><a href="R509/CertificateAuthority.html" title="R509::CertificateAuthority (module)">CertificateAuthority</a></span>, <span class='object_link'><a href="R509/Config.html" title="R509::Config (module)">Config</a></span>, <span class='object_link'><a href="R509/Crl.html" title="R509::Crl (module)">Crl</a></span>, <span class='object_link'><a href="R509/IOHelpers.html" title="R509::IOHelpers (module)">IOHelpers</a></span>, <span class='object_link'><a href="R509/Ocsp.html" title="R509::Ocsp (module)">Ocsp</a></span>, <span class='object_link'><a href="R509/Validity.html" title="R509::Validity (module)">Validity</a></span>
+      <strong class="modules">Modules:</strong> <span class='object_link'><a href="R509/ASN1.html" title="R509::ASN1 (module)">ASN1</a></span>, <span class='object_link'><a href="R509/CRL.html" title="R509::CRL (module)">CRL</a></span>, <span class='object_link'><a href="R509/CertificateAuthority.html" title="R509::CertificateAuthority (module)">CertificateAuthority</a></span>, <span class='object_link'><a href="R509/Config.html" title="R509::Config (module)">Config</a></span>, <span class='object_link'><a href="R509/IOHelpers.html" title="R509::IOHelpers (module)">IOHelpers</a></span>, <span class='object_link'><a href="R509/OCSP.html" title="R509::OCSP (module)">OCSP</a></span>, <span class='object_link'><a href="R509/OIDMapper.html" title="R509::OIDMapper (module)">OIDMapper</a></span>, <span class='object_link'><a href="R509/Validity.html" title="R509::Validity (module)">Validity</a></span>
     
   
     
-      <strong class="classes">Classes:</strong> <span class='object_link'><a href="R509/Cert.html" title="R509::Cert (class)">Cert</a></span>, <span class='object_link'><a href="R509/Csr.html" title="R509::Csr (class)">Csr</a></span>, <span class='object_link'><a href="R509/MessageDigest.html" title="R509::MessageDigest (class)">MessageDigest</a></span>, <span class='object_link'><a href="R509/NameSanitizer.html" title="R509::NameSanitizer (class)">NameSanitizer</a></span>, <span class='object_link'><a href="R509/OidMapper.html" title="R509::OidMapper (class)">OidMapper</a></span>, <span class='object_link'><a href="R509/PrivateKey.html" title="R509::PrivateKey (class)">PrivateKey</a></span>, <span class='object_link'><a href="R509/R509Error.html" title="R509::R509Error (class)">R509Error</a></span>, <span class='object_link'><a href="R509/Spki.html" title="R509::Spki (class)">Spki</a></span>, <span class='object_link'><a href="R509/Subject.html" title="R509::Subject (class)">Subject</a></span>
+      <strong class="classes">Classes:</strong> <span class='object_link'><a href="R509/CSR.html" title="R509::CSR (class)">CSR</a></span>, <span class='object_link'><a href="R509/Cert.html" title="R509::Cert (class)">Cert</a></span>, <span class='object_link'><a href="R509/MessageDigest.html" title="R509::MessageDigest (class)">MessageDigest</a></span>, <span class='object_link'><a href="R509/NameSanitizer.html" title="R509::NameSanitizer (class)">NameSanitizer</a></span>, <span class='object_link'><a href="R509/PrivateKey.html" title="R509::PrivateKey (class)">PrivateKey</a></span>, <span class='object_link'><a href="R509/R509Error.html" title="R509::R509Error (class)">R509Error</a></span>, <span class='object_link'><a href="R509/SPKI.html" title="R509::SPKI (class)">SPKI</a></span>, <span class='object_link'><a href="R509/Subject.html" title="R509::Subject (class)">Subject</a></span>
     
   
 </p>
@@ -129,7 +129,7 @@ support.</p>
 
 </div>
         </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.8.1</span><span class='tstring_end'>&quot;</span></span></pre></dd>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.9</span><span class='tstring_end'>&quot;</span></span></pre></dd>
       
     </dl>
   
@@ -140,14 +140,176 @@ support.</p>
 
 
 
+  
+    <h2>
+      Class Method Summary
+      <small>(<a href="#" class="summary_toggle">collapse</a>)</small>
+    </h2>
+
+    <ul class="summary">
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#ec_supported%3F-class_method" title="ec_supported? (class method)">+ (Boolean) <strong>ec_supported?</strong> </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'></div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#print_debug-class_method" title="print_debug (class method)">+ (Object) <strong>print_debug</strong> </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'>
+<p>print version information to console.</p>
+</div></span>
+  
+</li>
+
+      
+    </ul>
+  
+
+
+
+  <div id="class_method_details" class="method_details_list">
+    <h2>Class Method Details</h2>
+
+    
+      <div class="method_details first">
+  <h3 class="signature first" id="ec_supported?-class_method">
+  
+    + (<tt>Boolean</tt>) <strong>ec_supported?</strong> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+
+  </div>
+</div>
+<div class="tags">
+  
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+
+</div><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
+
+
+27
+28
+29</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/r509.rb', line 27</span>
+
+<span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_ec_supported?'>ec_supported?</span>
+  <span class='lparen'>(</span><span class='kw'>not</span> <span class='kw'>defined?</span><span class='lparen'>(</span><span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>PKey</span><span class='op'>::</span><span class='const'>EC</span><span class='op'>::</span><span class='const'>UNSUPPORTED</span><span class='rparen'>)</span><span class='rparen'>)</span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="print_debug-class_method">
+  
+    + (<tt>Object</tt>) <strong>print_debug</strong> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+<p>print version information to console</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
 
+</div><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
+
+
+20
+21
+22
+23
+24
+25</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/r509.rb', line 20</span>
+
+<span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_print_debug'>print_debug</span>
+  <span class='id identifier rubyid_puts'>puts</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>r509 v</span><span class='embexpr_beg'>#{</span><span class='const'>R509</span><span class='op'>::</span><span class='const'>VERSION</span><span class='rbrace'>}</span><span class='tstring_end'>&quot;</span></span>
+  <span class='id identifier rubyid_puts'>puts</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>OPENSSL_VERSION</span>
+  <span class='id identifier rubyid_puts'>puts</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Ruby </span><span class='embexpr_beg'>#{</span><span class='const'>RUBY_VERSION</span><span class='rbrace'>}</span><span class='tstring_content'>-p</span><span class='embexpr_beg'>#{</span><span class='const'>RUBY_PATCHLEVEL</span><span class='rbrace'>}</span><span class='tstring_end'>&quot;</span></span>
+  <span class='id identifier rubyid_puts'>puts</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Elliptic curve support: </span><span class='embexpr_beg'>#{</span><span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_ec_supported?'>ec_supported?</span><span class='rbrace'>}</span><span class='tstring_end'>&quot;</span></span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
+    
+  </div>
 
 </div>
 
     <div id="footer">
-  Generated on Thu Nov  8 14:19:24 2012 by
+  Generated on Tue Apr 16 10:49:55 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.2.1 (ruby-1.9.3).
+  0.8.5 (ruby-1.9.3).
 </div>
 
   </body>