heroku-api 0.3.2 → 0.3.3

data/changelog.txt

@@ -1,3 +1,12 @@
+0.3.3 09/15/2012
+================
+
+update to more realistic self signed cert in tests
+update body format for delete_ssl_endpoint
+vendor latest okjson
+patch okjson to work around encoding bug
+bump excon and use blocking requests
+
 0.3.2 08/01/2012
 ================
 

data/heroku-api.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'excon', '~>0.15.5'
+  s.add_runtime_dependency 'excon', '~>0.16.0'
 
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'

data/lib/heroku/api.rb

@@ -41,6 +41,7 @@ module Heroku
       options = {
         :headers  => {},
         :host     => 'api.heroku.com',
+        :nonblock => false,
         :scheme   => 'https'
       }.merge(options)
       options[:headers] = {

data/lib/heroku/api/vendor/okjson.rb

@@ -221,9 +221,9 @@ module Heroku
       end
 
 
-      def nulltok(s);  s[0,4] == 'null'  && [:val, 'null',  nil]   end
-      def truetok(s);  s[0,4] == 'true'  && [:val, 'true',  true]  end
-      def falsetok(s); s[0,5] == 'false' && [:val, 'false', false] end
+      def nulltok(s);  s[0,4] == 'null'  ? [:val, 'null',  nil]   : [] end
+      def truetok(s);  s[0,4] == 'true'  ? [:val, 'true',  true]  : [] end
+      def falsetok(s); s[0,5] == 'false' ? [:val, 'false', false] : [] end
 
 
       def numtok(s)
@@ -236,6 +236,8 @@ module Heroku
           else
             [:val, m[0], Integer(m[0])]
           end
+        else
+          []
         end
       end
 
@@ -263,13 +265,13 @@ module Heroku
       # Unquote will raise an error if q contains control characters.
       def unquote(q)
         q = q[1...-1]
-        a = q.dup # allocate a big enough string
         rubydoesenc = false
         # In ruby >= 1.9, a[w] is a codepoint, not a byte.
-        if a.class.method_defined?(:force_encoding)
-          a.force_encoding('UTF-8')
+        if q.class.method_defined?(:force_encoding)
+          q.force_encoding('UTF-8')
           rubydoesenc = true
         end
+        a = q.dup # allocate a big enough string
         r, w = 0, 0
         while r < q.length
           c = q[r]
@@ -376,15 +378,6 @@ module Heroku
       end
 
 
-      def unsubst(u)
-        if u < Usurrself || u > Umax || surrogate?(u)
-          return Ucharerr, Ucharerr
-        end
-        u -= Usurrself
-        [Usurr1 + ((u>>10)&0x3ff), Usurr2 + (u&0x3ff)]
-      end
-
-
       def surrogate?(u)
         Usurr1 <= u && u < Usurr3
       end
@@ -474,15 +467,18 @@ module Heroku
           else
             c = s[r]
             case true
+            when rubydoesenc
+              begin
+                c.ord # will raise an error if c is invalid UTF-8
+                t.write(c)
+              rescue
+                t.write(Ustrerr)
+              end
             when Spc <= c && c <= ?~
               t.putc(c)
-            when rubydoesenc
-              u = c.ord
-              surrenc(t, u)
             else
-              u, size = uchardec(s, r)
-              r += size - 1 # we add one more at the bottom of the loop
-              surrenc(t, u)
+              n = ucharcopy(t, s, r) # ensure valid UTF-8 output
+              r += n - 1 # r is incremented below
             end
           end
           r += 1
@@ -492,28 +488,6 @@ module Heroku
       end
 
 
-      def surrenc(t, u)
-        if u < 0x10000
-          t.print('\\u')
-          hexenc4(t, u)
-        else
-          u1, u2 = unsubst(u)
-          t.print('\\u')
-          hexenc4(t, u1)
-          t.print('\\u')
-          hexenc4(t, u2)
-        end
-      end
-
-
-      def hexenc4(t, u)
-        t.putc(Hex[(u>>12)&0xf])
-        t.putc(Hex[(u>>8)&0xf])
-        t.putc(Hex[(u>>4)&0xf])
-        t.putc(Hex[u&0xf])
-      end
-
-
       def numenc(x)
         if ((x.nan? || x.infinite?) rescue false)
           raise Error, "Numeric cannot be represented: #{x}"
@@ -522,60 +496,77 @@ module Heroku
       end
 
 
-      # Decodes unicode character u from UTF-8
-      # bytes in string s at position i.
-      # Returns u and the number of bytes read.
-      def uchardec(s, i)
+      # Copies the valid UTF-8 bytes of a single character
+      # from string s at position i to I/O object t, and
+      # returns the number of bytes copied.
+      # If no valid UTF-8 char exists at position i,
+      # ucharcopy writes Ustrerr and returns 1.
+      def ucharcopy(t, s, i)
         n = s.length - i
-        return [Ucharerr, 1] if n < 1
+        raise Utf8Error if n < 1
 
         c0 = s[i].ord
 
         # 1-byte, 7-bit sequence?
         if c0 < Utagx
-          return [c0, 1]
+          t.putc(c0)
+          return 1
         end
 
-        # unexpected continuation byte?
-        return [Ucharerr, 1] if c0 < Utag2
+        raise Utf8Error if c0 < Utag2 # unexpected continuation byte?
 
-        # need continuation byte
-        return [Ucharerr, 1] if n < 2
+        raise Utf8Error if n < 2 # need continuation byte
         c1 = s[i+1].ord
-        return [Ucharerr, 1] if c1 < Utagx || Utag2 <= c1
+        raise Utf8Error if c1 < Utagx || Utag2 <= c1
 
         # 2-byte, 11-bit sequence?
         if c0 < Utag3
-          u = (c0&Umask2)<<6 | (c1&Umaskx)
-          return [Ucharerr, 1] if u <= Uchar1max
-          return [u, 2]
+          raise Utf8Error if ((c0&Umask2)<<6 | (c1&Umaskx)) <= Uchar1max
+          t.putc(c0)
+          t.putc(c1)
+          return 2
         end
 
         # need second continuation byte
-        return [Ucharerr, 1] if n < 3
+        raise Utf8Error if n < 3
+
         c2 = s[i+2].ord
-        return [Ucharerr, 1] if c2 < Utagx || Utag2 <= c2
+        raise Utf8Error if c2 < Utagx || Utag2 <= c2
 
         # 3-byte, 16-bit sequence?
         if c0 < Utag4
           u = (c0&Umask3)<<12 | (c1&Umaskx)<<6 | (c2&Umaskx)
-          return [Ucharerr, 1] if u <= Uchar2max
-          return [u, 3]
+          raise Utf8Error if u <= Uchar2max
+          t.putc(c0)
+          t.putc(c1)
+          t.putc(c2)
+          return 3
         end
 
         # need third continuation byte
-        return [Ucharerr, 1] if n < 4
+        raise Utf8Error if n < 4
         c3 = s[i+3].ord
-        return [Ucharerr, 1] if c3 < Utagx || Utag2 <= c3
+        raise Utf8Error if c3 < Utagx || Utag2 <= c3
 
         # 4-byte, 21-bit sequence?
         if c0 < Utag5
           u = (c0&Umask4)<<18 | (c1&Umaskx)<<12 | (c2&Umaskx)<<6 | (c3&Umaskx)
-          return [Ucharerr, 1] if u <= Uchar3max
-          return [u, 4]
-        end
+          raise Utf8Error if u <= Uchar3max
+          t.putc(c0)
+          t.putc(c1)
+          t.putc(c2)
+          t.putc(c3)
+          return 4
+        end
+
+        raise Utf8Error
+      rescue Utf8Error
+        t.write(Ustrerr)
+        return 1
+      end
+
 
-        return [Ucharerr, 1]
+      class Utf8Error < ::StandardError
       end
 
 
@@ -596,15 +587,14 @@ module Heroku
       Uchar2max = (1<<11) - 1
       Uchar3max = (1<<16) - 1
       Ucharerr = 0xFFFD # unicode "replacement char"
+      Ustrerr = "\xef\xbf\xbd" # unicode "replacement char"
       Usurrself = 0x10000
       Usurr1 = 0xd800
       Usurr2 = 0xdc00
       Usurr3 = 0xe000
-      Umax = 0x10ffff
 
       Spc = ' '[0]
       Unesc = {?b=>?\b, ?f=>?\f, ?n=>?\n, ?r=>?\r, ?t=>?\t}
-      Hex = '0123456789abcdef'
     end
   end
 end

data/lib/heroku/api/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   class API
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/test/data/site.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC/jCCAeYCCQDqx6gBfaFHsjANBgkqhkiG9w0BAQUFADBBMQswCQYDVQQGEwJV
+UzELMAkGA1UECBMCQ0ExDzANBgNVBAoTBkhlcm9rdTEUMBIGA1UEAxMLZXhhbXBs
+ZS5jb20wHhcNMTIwODAxMjIzMjA5WhcNMTMwODAxMjIzMjA5WjBBMQswCQYDVQQG
+EwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAoTBkhlcm9rdTEUMBIGA1UEAxMLZXhh
+bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/0Nhc36j5
+CHgbEFYyExDR6PKLrhfJPGtYZTDlpy+d/vT+sFp1m81k/68/ylQwq7lJROvfrQ0M
+vAZNO2axWOJnjSrEqQo96VLrFYp5dmkG7bWBjAa+aHzn3fvoKQ2NDrFLFRcuaw0Q
+ra593EFry1VfbI4UeQPdy1V4fFm2A0l9S33Y9Fd/Qv/kUShKgjJXJISdg6PFruz9
+XLqO3kjS1wDVCBrm+t3D6qxC99N3fW//9tCgjZHaiRRgs5B5DyJI3CIi1vmUR5IZ
+7vGFFtw84LcOh6PHWr/ZwRCDJa4dFtjI5fix6GLJZ7FhmezDyeqzqbVVEOIO9wbN
+0QXV1d8BBCw1AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAHsCtjR4qNfwtcBu95oR
+jBnUReaxkYLA3Tbcy5bqusLnPvlgUhNn4XUWuPy0QVPP9TK/VGguqZrpJlfdWUJW
+qrh5VX7ixieGWzHGw1bDzHA5ZNchyQyLyFHdXGw1dA85yVXZoAFkUxwY0qCRGWnt
+/Kqct507tqsilFpliS9lzAY/E1GYSHRWuXB6I6tMZD0/jd9zPcg8Y/2aYuvuZ2SC
+A3P04IhG9X9O8MGEPlxdlxmSHi6Vuj8iV+5N3zcodntOcLHlRm6grOC4y6xXaIfE
+KDNGnoOsTJA+yPVtx8R2oZUHA52y09EjujzwMvXgKiq9R33zw6eQwrsD6Pp023Hj
+6CQ=
+-----END CERTIFICATE-----

data/test/data/site.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAv9DYXN+o+Qh4GxBWMhMQ0ejyi64XyTxrWGUw5acvnf70/rBa
+dZvNZP+vP8pUMKu5SUTr360NDLwGTTtmsVjiZ40qxKkKPelS6xWKeXZpBu21gYwG
+vmh859376CkNjQ6xSxUXLmsNEK2ufdxBa8tVX2yOFHkD3ctVeHxZtgNJfUt92PRX
+f0L/5FEoSoIyVySEnYOjxa7s/Vy6jt5I0tcA1Qga5vrdw+qsQvfTd31v//bQoI2R
+2okUYLOQeQ8iSNwiItb5lEeSGe7xhRbcPOC3Doejx1q/2cEQgyWuHRbYyOX4sehi
+yWexYZnsw8nqs6m1VRDiDvcGzdEF1dXfAQQsNQIDAQABAoIBAQCt/ExUqZbGFHWE
+7uOQVhTaobZnFkmDAefIbTjWBji90gX9go76wJCkfPtEHE0TPKA7ImXlJD2DAIWi
+xi+Wy63JCZXyffXJRHsuuwI4vDv1yeXqFM4FJhet5X9aDOq6uMn99apqMzXNnAx7
+Iy7ADNZqULfrP/1Oz+G+AOUKoJ6nIyD6v1dGCfJhZhQyymhyOsEYjXl2RzSLHL1G
+d6+404nnV7hP8zhQjREleYk/F1ZewJhtS7Tsv9YeeuckLQDBTfutuyS07QzRvnyf
+XqXo9mhkl0OK27Jml82XFwquFBe/FoH8lKoXax3PT5xXQ6/UJQ4pOJi3D5ZnOLUk
+Lsc9Fr89AoGBAOmbzXuF62MksVsk6bcV1UhmY+sGSNQwRa7GShczMgQE/GHDTayW
+km2T1NLQt5oL0lnXMtuX6Wi0y2oNu+x3q5/O7DR+EQqsX4nbX34jynNsEmRv27pC
+vACq7wRaaDoLWm14DX8Qp8KZmPTXsoRoswv6/hdvPMg3nNB+HxP10LknAoGBANIz
+jAKi2XkaJRkSMBuqTjND3UkDIOwcd1v5V3Dy0bLlegBTxyIhlhicwO6JHZ8u5obx
+68eikKMc9gXf6hJTcNXbogf6t4+/v5oKgPVA6puPefZkt1Lswc1aR7NdC5tYmplc
+C71WZISEONEQsTbp1c5QOJ69/gf325IE3sXb+vFDAoGAIy97WKKIHKu3JuI9bX0V
+Xc1GOWz95S/MHxHwsOPeIaralKME/PzE20pL4ODc9o/XQ/7cwyRzXHj2tmeRKYGw
+0OYqv5FJYdEqpqnrDSW45X+emZAbiUdp57PXQlGXpz50hU5ywfOxQOc/mYkvczAN
+370TLlZr0kBGF0UXyzrYEDsCgYAlHm8qBAHtTb2hWMHgEMnwaZqJCyFkMH6vYi+b
+xXVcZwONTT4L++xaekvjk5kEhC63Q79EKKPr+fBEB095Xvy89yT8zbxeiRjXpeUx
+6f3D7Kk35n8tCJwMnFWvCc5D53idflCgZcIoWIUD/jOdI9vaq/Xjql9SnuVKOsvw
+GrGMqwKBgQCytS+qZdQ8/OoDSO+iLQr7prVxAfzVwuPggTIoRKcdU83o/2O89ipY
+zkcS+NcCD78phRydu9G6dFhDThkQYGcouF1tYpNqbjqqMoudcP35yE2+h3pzmiuV
+hZIQ2YjfaWARcNX+881gDb7m6835lCFyAZ75z9xsSWpYb+4EVH0gjg==
+-----END RSA PRIVATE KEY-----

data/test/test_helper.rb

@@ -8,12 +8,12 @@ require 'time'
 DATA_PATH = File.expand_path("#{File.dirname(__FILE__)}/data")
 MOCK = ENV['MOCK'] != 'false'
 
-def data_server_crt
-  @data_server_crt ||= File.read(File.join(DATA_PATH, 'server.crt'))
+def data_site_crt
+  @data_site_crt ||= File.read(File.join(DATA_PATH, 'site.crt'))
 end
 
-def data_server_key
-  @data_server_key ||= File.read(File.join(DATA_PATH, 'server.key'))
+def data_site_key
+  @data_site_key ||= File.read(File.join(DATA_PATH, 'site.key'))
 end
 
 def heroku

data/test/test_ssl_endpoints.rb

@@ -6,11 +6,18 @@ class TestSslEndpoints < MiniTest::Unit::TestCase
     skip if MOCK
     with_app do |app_data|
       heroku.post_addon(app_data['name'], 'ssl:endpoint')
-      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key).body
+      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_site_crt, data_site_key).body
 
       response = heroku.delete_ssl_endpoint(app_data['name'], ssl_endpoint_data['cname'])
 
-      assert_equal(' ', response.body)
+      data = response.body['ssl_cert']
+      assert_equal(false, data['ca_signed?'])
+      assert_equal(true, data['self_signed?'])
+      assert_equal(['example.com'], data['cert_domains'])
+      assert_equal('2013/08/01 15:32:09 -0700', data['expires_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['issuer'])
+      assert_equal('2012/08/01 15:32:09 -0700', data['starts_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['subject'])
       assert_equal(200, response.status)
     end
   end
@@ -26,18 +33,18 @@ class TestSslEndpoints < MiniTest::Unit::TestCase
     skip if MOCK
     with_app do |app_data|
       heroku.post_addon(app_data['name'], 'ssl:endpoint')
-      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key).body
+      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_site_crt, data_site_key).body
 
       response = heroku.get_ssl_endpoint(app_data['name'], ssl_endpoint_data['cname'])
 
       data = response.body['ssl_cert']
       assert_equal(false, data['ca_signed?'])
       assert_equal(true, data['self_signed?'])
-      assert_equal(['geemus (wesley beary)'], data['cert_domains'])
-      assert_equal('2013/07/30 15:19:30 -0700', data['expires_at'])
-      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['issuer'])
-      assert_equal('2012/07/30 15:19:30 -0700', data['starts_at'])
-      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['subject'])
+      assert_equal(['example.com'], data['cert_domains'])
+      assert_equal('2013/08/01 15:32:09 -0700', data['expires_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['issuer'])
+      assert_equal('2012/08/01 15:32:09 -0700', data['starts_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['subject'])
       assert_equal(200, response.status)
     end
   end
@@ -46,18 +53,18 @@ class TestSslEndpoints < MiniTest::Unit::TestCase
     skip if MOCK
     with_app do |app_data|
       heroku.post_addon(app_data['name'], 'ssl:endpoint')
-      heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key)
+      heroku.post_ssl_endpoint(app_data['name'], data_site_crt, data_site_key)
 
       response = heroku.get_ssl_endpoints(app_data['name'])
 
       data = response.body.first['ssl_cert']
       assert_equal(false, data['ca_signed?'])
       assert_equal(true, data['self_signed?'])
-      assert_equal(['geemus (wesley beary)'], data['cert_domains'])
-      assert_equal('2013/07/30 15:19:30 -0700', data['expires_at'])
-      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['issuer'])
-      assert_equal('2012/07/30 15:19:30 -0700', data['starts_at'])
-      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['subject'])
+      assert_equal(['example.com'], data['cert_domains'])
+      assert_equal('2013/08/01 15:32:09 -0700', data['expires_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['issuer'])
+      assert_equal('2012/08/01 15:32:09 -0700', data['starts_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['subject'])
       assert_equal(200, response.status)
     end
   end
@@ -67,16 +74,16 @@ class TestSslEndpoints < MiniTest::Unit::TestCase
     with_app do |app_data|
       heroku.post_addon(app_data['name'], 'ssl:endpoint')
 
-      response = heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key)
+      response = heroku.post_ssl_endpoint(app_data['name'], data_site_crt, data_site_key)
 
       data = response.body['ssl_cert']
       assert_equal(false, data['ca_signed?'])
       assert_equal(true, data['self_signed?'])
-      assert_equal(['geemus (wesley beary)'], data['cert_domains'])
-      assert_equal('2013/07/30 15:19:30 -0700', data['expires_at'])
-      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['issuer'])
-      assert_equal('2012/07/30 15:19:30 -0700', data['starts_at'])
-      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['subject'])
+      assert_equal(['example.com'], data['cert_domains'])
+      assert_equal('2013/08/01 15:32:09 -0700', data['expires_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['issuer'])
+      assert_equal('2012/08/01 15:32:09 -0700', data['starts_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['subject'])
       assert_equal(200, response.status)
     end
   end
@@ -85,19 +92,19 @@ class TestSslEndpoints < MiniTest::Unit::TestCase
     skip if MOCK
     with_app do |app_data|
       heroku.post_addon(app_data['name'], 'ssl:endpoint')
-      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key).body
-      heroku.put_ssl_endpoint(app_data['name'], ssl_endpoint_data['cname'], data_server_crt, data_server_key)
+      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_site_crt, data_site_key).body
+      heroku.put_ssl_endpoint(app_data['name'], ssl_endpoint_data['cname'], data_site_crt, data_site_key)
 
       response = heroku.post_ssl_endpoint_rollback(app_data['name'], ssl_endpoint_data['cname'])
 
       data = response.body['ssl_cert']
       assert_equal(false, data['ca_signed?'])
       assert_equal(true, data['self_signed?'])
-      assert_equal(['geemus (wesley beary)'], data['cert_domains'])
-      assert_equal('2013/07/30 15:19:30 -0700', data['expires_at'])
-      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['issuer'])
-      assert_equal('2012/07/30 15:19:30 -0700', data['starts_at'])
-      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['subject'])
+      assert_equal(['example.com'], data['cert_domains'])
+      assert_equal('2013/08/01 15:32:09 -0700', data['expires_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['issuer'])
+      assert_equal('2012/08/01 15:32:09 -0700', data['starts_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['subject'])
       assert_equal(200, response.status)
     end
   end
@@ -106,18 +113,18 @@ class TestSslEndpoints < MiniTest::Unit::TestCase
     skip if MOCK
     with_app do |app_data|
       heroku.post_addon(app_data['name'], 'ssl:endpoint')
-      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_server_crt, data_server_key).body
+      ssl_endpoint_data = heroku.post_ssl_endpoint(app_data['name'], data_site_crt, data_site_key).body
 
-      response = heroku.put_ssl_endpoint(app_data['name'], ssl_endpoint_data['cname'], data_server_crt, data_server_key)
+      response = heroku.put_ssl_endpoint(app_data['name'], ssl_endpoint_data['cname'], data_site_crt, data_site_key)
 
       data = response.body['ssl_cert']
       assert_equal(false, data['ca_signed?'])
       assert_equal(true, data['self_signed?'])
-      assert_equal(['geemus (wesley beary)'], data['cert_domains'])
-      assert_equal('2013/07/30 15:19:30 -0700', data['expires_at'])
-      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['issuer'])
-      assert_equal('2012/07/30 15:19:30 -0700', data['starts_at'])
-      assert_equal('/C=US/O=Heroku/CN=geemus (Wesley Beary)/emailAddress=wesley@heroku.com', data['subject'])
+      assert_equal(['example.com'], data['cert_domains'])
+      assert_equal('2013/08/01 15:32:09 -0700', data['expires_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['issuer'])
+      assert_equal('2012/08/01 15:32:09 -0700', data['starts_at'])
+      assert_equal('/C=US/ST=CA/O=Heroku/CN=example.com', data['subject'])
       assert_equal(200, response.status)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-api
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70119193362320 !ruby/object:Gem::Requirement
+  requirement: &70255687099020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.5
+        version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70119193362320
+  version_requirements: *70255687099020
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70119193360480 !ruby/object:Gem::Requirement
+  requirement: &70255687097700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119193360480
+  version_requirements: *70255687097700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70119193355000 !ruby/object:Gem::Requirement
+  requirement: &70255687096380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119193355000
+  version_requirements: *70255687096380
 description: Ruby Client for the Heroku API
 email:
 - wesley@heroku.com
@@ -94,8 +94,8 @@ files:
 - lib/heroku/api/user.rb
 - lib/heroku/api/vendor/okjson.rb
 - lib/heroku/api/version.rb
-- test/data/server.crt
-- test/data/server.key
+- test/data/site.crt
+- test/data/site.key
 - test/test_addons.rb
 - test/test_apps.rb
 - test/test_collaborators.rb
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2298175570851415714
+      hash: 4015370602863934234
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2298175570851415714
+      hash: 4015370602863934234
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -142,8 +142,8 @@ signing_key:
 specification_version: 3
 summary: Ruby Client for the Heroku API
 test_files:
-- test/data/server.crt
-- test/data/server.key
+- test/data/site.crt
+- test/data/site.key
 - test/test_addons.rb
 - test/test_apps.rb
 - test/test_collaborators.rb

data/test/data/server.crt

@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDPDCCAiQCCQCh/jTWfdrzuDANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJV
-UzEPMA0GA1UEChMGSGVyb2t1MR4wHAYDVQQDExVnZWVtdXMgKFdlc2xleSBCZWFy
-eSkxIDAeBgkqhkiG9w0BCQEWEXdlc2xleUBoZXJva3UuY29tMB4XDTEyMDczMDIy
-MTkzMFoXDTEzMDczMDIyMTkzMFowYDELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkhl
-cm9rdTEeMBwGA1UEAxMVZ2VlbXVzIChXZXNsZXkgQmVhcnkpMSAwHgYJKoZIhvcN
-AQkBFhF3ZXNsZXlAaGVyb2t1LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAOLKtOae7E8zilNDZfdrg943Q6UOpV9+0i/LHR38vMcgbWJ1KO/ei/d7
-i0Ei6krOJjrLcxZH4ixxSRTHeKv8iYqH+IUXnDAxoLSi64/0xrCo+EQibDWx7dFy
-zgDqE2CCsf9LJmU3O2gshiTnuyZPyxAHumDp9uyf56T1L3tCyjTyjagigkxOcR9/
-Hff7aV1Emtu4pQvza2mFIxL8PA2FYm850dHQod3TtSrL+HtUZOxS4wBZD6Pw+3vA
-i0jemuFXBszgwDQl0zF1zQ8u1dQmo5PETr8Swnx7LN7G/BauUZ3iXt91M83kE0Pw
-tFNIAAVvajUFDi42jWdOBwXQE7XlEdUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-3K5EOBNclZzlrrGU+vrawhoERPGShMDqA8Xqk7wXnYFhtj/3432+SRxSfrNEatqD
-+lTdSdzERvJBWXHX5xJyu2GmenMNbA4WleqUKPhCXjyCz7dPUUp5hYNcCeAFENYl
-6MJX0NNrfgRLC8guWseerCAosPAr7Tw4SjMLYVl2yakV5O4e3E5rwazFOr15aMN/
-oUp0RjkkgqqVCNua2zwXk23OSnqO+quKSbpmjRI5e00qFyp70n0T3+ODl+1GFczJ
-iTPDEBkW7A4q/lNMlKful7kEeEOhRXfXoGwoSVracDD/bBngXKu0Epgv8LzQVQkK
-IZf1KG3pPS7kiGgk31G4Wg==
------END CERTIFICATE-----

data/test/data/server.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA4sq05p7sTzOKU0Nl92uD3jdDpQ6lX37SL8sdHfy8xyBtYnUo
-796L93uLQSLqSs4mOstzFkfiLHFJFMd4q/yJiof4hRecMDGgtKLrj/TGsKj4RCJs
-NbHt0XLOAOoTYIKx/0smZTc7aCyGJOe7Jk/LEAe6YOn27J/npPUve0LKNPKNqCKC
-TE5xH38d9/tpXUSa27ilC/NraYUjEvw8DYVibznR0dCh3dO1Ksv4e1Rk7FLjAFkP
-o/D7e8CLSN6a4VcGzODANCXTMXXNDy7V1Cajk8ROvxLCfHss3sb8Fq5RneJe33Uz
-zeQTQ/C0U0gABW9qNQUOLjaNZ04HBdATteUR1QIDAQABAoIBAQCJDqPgs65v9t/j
-jdmzeuBIjPFucLl0SrpPc9p24uRbGrfARrmkrMO9noX7qVQaPRdRdN5qWqrO3O+j
-hSDiH04n0CBanngfj/5k7AicCPuCi7rtwjfPA2aLq2vflZZ8Pr+/XvUnOgfG3xF6
-gCjT8GjxmRoDs6EsQz7ErAAz55s3/zJjYp25bauULPML9/KVNaGM87ynAK+2NEki
-QEBydo/BzxtuMYu/sUPd1eAj1UyIVW+h6K01H0xmU5Vx2xD/+prHcYidTzFPyDWz
-3A96Yj9xl8QuiF9h8st919ot80I0V8LOjJ0yuCpNq3Qu9zV6OHW+SPRkYrUQf6o3
-6Mty5zQJAoGBAPS1R6MY7B1yO+OkLTY1ibAzmdK/G6pvFNC/dbl5VFfTgxi4sjth
-Sg44jd1Ttd/LnqQ4SQBRXm/UI3CxoYsF6BQFG8WDdQ+Kn1wB9SzBQl+bz/KYUBbQ
-r/mwWW9F91aavz8NAALIjRk3wz+PtN4aV2M7BOlEmVxHVQ8K3piqEZI3AoGBAO1B
-yGQ8Uh9VxFnghqgJY2gWPXLq4ju3sef+16nSVvS0+ypOq55w3uXX8zfa9riKyTau
-J4QIJYGtYR9dVWyn3mp2F7AesL9Qk5+g3q6hMpFGamaiL+GaEbjfKWjxdp1EC6qs
-LwYHYuo9DrCkApbPnFoHpbaOYPQ+BhxzdVFYNaZTAoGBAKQVCbvq8ieseUviwg4f
-R/vGHdaaHkrhwOtX9fAv0sYxJS5madw3GBkBAt7tSn6NYgprU0fLR69kZ38hHFjD
-1SHXaw+9XbjWEpT3GxavX3oMWBsq1kj2FYkvHkjmeTqw+Jumc+Np5nKKWXk9OuHS
-d9YptNlVDiA6FGbJuwhSwQVxAoGAcB0qzbr3b5k+3N3No/AzykbgKMK3v1Jxvlhd
-nwEnWCGBop9kV82sdt5SL23IMrJanP007R5QYvQENicLq/mzj4lYbkBCc1VnPQJu
-2ASSebXVp8QybiA5CaxizBV2YKB8Bt2wpt+srVXG8E/AbXWTw7Njal3jkOcSSjWB
-FbxiNcMCgYApDMoIJRshdDUbnAmHBiejBxAbyrnhjs5LIklDb3R5OBm2OdgtpDPX
-OEQVS9jHW2rBsLKHTi5bqFfVV1UsIH0nw3aTj4qhEzlVwoGIrrkKN5HG0TK991Y+
-nMZF5DpWRpXGilpBqD3ZYExmDvPW8DkvxCSH7O2tuaAMg9djm/wyzw==
------END RSA PRIVATE KEY-----