kensa 1.2.0 → 1.2.1

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7 
+  - 1.9.2
+notifications:
+  email: 
+    - csquared@heroku.com
+    - glenn@heroku.com

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    kensa (1.2.0)
+    kensa (1.2.1)
       launchy (>= 0.3.2)
       mechanize (~> 1.0.0)
-      rest-client (>= 1.4.0, < 1.7.0)
+      rest-client (< 1.7.0, >= 1.4.0)
       term-ansicolor (~> 1.0)
-      yajl-ruby (~> 0.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
     archive-tar-minitar (0.5.2)
+    artifice (0.6)
+      rack-test
     columnize (0.3.4)
     contest (0.1.3)
     fakefs (0.4.0)
     haml (3.1.2)
-    json (1.5.3)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     linecache (0.43)
@@ -28,6 +28,8 @@ GEM
     mime-types (1.17.2)
     nokogiri (1.5.0)
     rack (1.3.2)
+    rack-test (0.6.1)
+      rack (>= 1.0)
     rake (0.9.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -53,16 +55,15 @@ GEM
     term-ansicolor (1.0.7)
     tilt (1.3.2)
     timecop (0.3.5)
-    yajl-ruby (0.8.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  artifice
   contest
   fakefs
   haml
-  json
   kensa!
   rake
   rr

data/README.md

@@ -1,6 +1,8 @@
 Kensa
 =====
 
+<img src="https://secure.travis-ci.org/heroku/kensa.png" />
+
 Kensa is a command-line utility to help Heroku add-on providers integrating
 their services to Heroku. It offers commands to create and validate manifests,
 and to run the same API calls Heroku runs on your service to provision and
@@ -24,6 +26,6 @@ http://provider.heroku.com/resources/technical/build/provisioning
 
 ## Meta #######################################################################
 
-Maintained by Pedro Belo.
+Maintained by Glenn Gillen and csquared.
 
 Released under the MIT license. http://github.com/heroku/kensa

data/Rakefile

@@ -7,14 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/*_test.rb"]
 end
 
-desc 'Start the server'
-task :start do
-  fork { exec "ruby test/resources/server.rb > test_log.txt 2>&1" }
-end
-
-desc 'Stop the server'
-task :stop do
-  system "ps -ax | grep test/resources/server.rb | grep -v grep | awk '{print $1}' | xargs kill"
-end
-
-task :default => [:start, :test, :stop]
+task :default => :test

data/bin/kensa

@@ -68,8 +68,11 @@ COMMANDS
 
 TEST TYPES
 
-  provision
+  provision [optional params] 
     Simulate a provision call from Heroku.
+    [optional params]
+      accepts extra command options and passes them on to the provision request
+      ie: kensa test provision --foo bar
 
   deprovision <id>
     Simulate a deprovision call from Heroku.

data/kensa.gemspec

@@ -26,13 +26,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<contest>, [">= 0"])
   s.add_development_dependency(%q<timecop>, [">= 0.3.5"])
   s.add_development_dependency(%q<sinatra>, [">= 0.9"])
-  s.add_development_dependency(%q<json>, [">= 0"])
   s.add_development_dependency(%q<contest>, [">= 0"])
   s.add_development_dependency(%q<haml>, [">= 0"])
   s.add_development_dependency(%q<rr>, [">= 0"])
   s.add_development_dependency(%q<fakefs>, [">= 0"])
+  s.add_development_dependency(%q<artifice>, [">= 0"])
   s.add_runtime_dependency(%q<rest-client>, ["< 1.7.0", ">= 1.4.0"])
-  s.add_runtime_dependency(%q<yajl-ruby>, ["~> 0.6"])
   s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0"])
   s.add_runtime_dependency(%q<launchy>, [">= 0.3.2"])
   s.add_runtime_dependency(%q<mechanize>, ["~> 1.0.0"])

data/lib/heroku/kensa.rb

@@ -6,3 +6,4 @@ require 'heroku/kensa/sso'
 require 'heroku/kensa/post_proxy'
 require 'heroku/kensa/screen'
 require 'heroku/kensa/git'
+require 'heroku/kensa/okjson'

data/lib/heroku/kensa/check.rb

@@ -1,4 +1,3 @@
-require 'yajl'
 require 'mechanize'
 require 'socket'
 require 'timeout'
@@ -102,6 +101,7 @@ module Heroku
         check "contains production url" do
           data["api"].has_key?("production")
         end
+
         if data['api']['production'].is_a? Hash
           check "production url uses SSL" do
             data['api']['production']['base_url'] =~ /^https:/
@@ -114,31 +114,35 @@ module Heroku
             data['api']['production'] =~ /^https:/
           end
         end
-        check "contains config_vars array" do
-          data["api"].has_key?("config_vars") && data["api"]["config_vars"].is_a?(Array)
-        end
-        check "containst at least one config var" do
-          !data["api"]["config_vars"].empty?
-        end
-        check "all config vars are uppercase strings" do
-          data["api"]["config_vars"].each do |k, v|
-            if k =~ /^[A-Z][0-9A-Z_]+$/
-              true
-            else
-              error "#{k.inspect} is not a valid ENV key"
+
+        if data["api"].has_key?("config_vars") 
+          check "contains config_vars array" do
+            data["api"]["config_vars"].is_a?(Array)
+          end
+          check "containst at least one config var" do
+            !data["api"]["config_vars"].empty?
+          end
+          check "all config vars are uppercase strings" do
+            data["api"]["config_vars"].each do |k, v|
+              if k =~ /^[A-Z][0-9A-Z_]+$/
+                true
+              else
+                error "#{k.inspect} is not a valid ENV key"
+              end
             end
           end
-        end
-        check "all config vars are prefixed with the addon id" do
-          data["api"]["config_vars"].each do |k|
-            addon_key = data['id'].upcase.gsub('-', '_')
-            if k =~ /^#{addon_key}_/
-              true
-            else
-              error "#{k} is not a valid ENV key - must be prefixed with #{addon_key}_"
+          check "all config vars are prefixed with the addon id" do
+            data["api"]["config_vars"].each do |k|
+              addon_key = data['id'].upcase.gsub('-', '_')
+              if k =~ /^#{addon_key}_/
+                true
+              else
+                error "#{k} is not a valid ENV key - must be prefixed with #{addon_key}_"
+              end
             end
           end
         end
+
         check "deprecated fields" do
           if data["api"].has_key?("username")
             error "username is deprecated: Please authenticate using the add-on id."
@@ -250,7 +254,7 @@ module Heroku
           :plan => data[:plan] || 'test',
           :callback_url => callback, 
           :logplex_token => nil,
-          :options => {}
+          :options => data[:options] || {}
         }
 
         if data[:async]
@@ -294,8 +298,8 @@ module Heroku
 
         check "valid JSON" do
           begin
-            response = Yajl::Parser.parse(json)
-          rescue Yajl::ParseError => boom
+            response = OkJson.decode(json)
+          rescue OkJson::Error => boom
             error boom.message
           end
           true

data/lib/heroku/kensa/client.rb

@@ -6,6 +6,8 @@ require 'optparse'
 module Heroku
   module Kensa
     class Client
+      attr_accessor :options
+
       def initialize(args, options = {})
         @args    = args
         @options = OptParser.parse(args).merge(options)
@@ -71,7 +73,7 @@ module Heroku
 
       def sso
         id = @args.shift || abort("! no id specified; see usage")
-        data = Yajl::Parser.parse(resolve_manifest).merge(:id => id)
+        data = OkJson.decode(resolve_manifest).merge(:id => id)
         sso = Sso.new(data.merge(@options)).start
         puts sso.message
         Launchy.open sso.sso_url
@@ -80,7 +82,7 @@ module Heroku
       def push
         user, password = ask_for_credentials
         host     = heroku_host
-        data     = Yajl::Parser.parse(resolve_manifest)
+        data     = OkJson.decode(resolve_manifest)
         resource = RestClient::Resource.new(host, user, password)
         resource['provider/addons'].post(resolve_manifest, headers)
         puts "-----> Manifest for \"#{data['id']}\" was pushed successfully"
@@ -148,11 +150,11 @@ module Heroku
           options = args.pop if args.last.is_a?(Hash)
 
           args.each do |klass|
-            data   = Yajl::Parser.parse(resolve_manifest)
+            data   = OkJson.decode(resolve_manifest)
             check  = klass.new(data.merge(@options.merge(options)), screen)
             result = check.call
             screen.finish
-            exit 1 if !result
+            exit 1 if !result && !(@options[:test])
           end
         end
 
@@ -242,6 +244,10 @@ module Heroku
 
 
       class OptParser
+        def self.parse(args)
+          defaults.merge(self.parse_options(args))
+        end
+
         def self.defaults
           {
             :filename => 'addon-manifest.json',
@@ -249,9 +255,31 @@ module Heroku
             :async    => false,
           }
         end
-        
-        def self.parse(args)
-          self.defaults.tap do |options|
+
+        # OptionParser errors out on unnamed options so we have to pull out all the --flags and --flag=somethings
+        KNOWN_ARGS = %w{file async production without-sso help plan version sso foreman template}
+        def self.pre_parse(args)
+          args.partition do |token| 
+            token.match(/^--/) && !token.match(/^--(#{KNOWN_ARGS.join('|')})/)
+          end.reverse
+        end
+
+        def self.parse_provision(flags, args)
+          {}.tap do |options|
+            flags.each do |arg|
+              key, value = arg.split('=')
+              unless value
+                peek = args[args.index(key) + 1]
+                value = peek && !peek.match(/^--/) ? peek : 'true'
+              end
+              key = key.sub(/^--/,'')
+              options[key] = value 
+            end
+          end
+        end
+
+        def self.parse_command_line(args)
+          {}.tap do |options|
             OptionParser.new do |o|
               o.on("-f file", "--file") { |filename| options[:filename] = filename }
               o.on("--async")           { options[:async] = true }
@@ -265,16 +293,28 @@ module Heroku
               o.on("-t name", "--template") do |template|
                 options[:template] = template
               end
+              #note: have to add these to KNOWN_ARGS
 
               begin
                 o.parse!(args)
-              rescue OptionParser::InvalidOption
-                #skip over invalid options
-                retry
+              rescue OptionParser::InvalidOption => e
+                raise CommandInvalid, e.message
               end
             end
           end
         end
+        
+        def self.parse(args)
+          if args[0] == 'test' && args[1] == 'provision'
+            safe_args, extra_params = self.pre_parse(args)
+            self.defaults.tap do |options| 
+              options.merge! self.parse_command_line(safe_args)
+              options.merge! :options => self.parse_provision(extra_params, args)
+            end
+          else
+            self.defaults.merge(self.parse_command_line(args))
+          end
+        end
       end 
     end
   end

data/lib/heroku/kensa/http.rb

@@ -27,7 +27,7 @@ module Heroku
 
         begin
           args = [
-            (Yajl::Encoder.encode(payload) if payload),
+            (OkJson.encode(payload) if payload),
             {
               :accept => "application/json",
               :content_type => "application/json"

data/lib/heroku/kensa/manifest.rb

@@ -3,7 +3,7 @@ module Heroku
     class Manifest
 
       def initialize(options = {})
-        @method   = options.fetch(:method, 'post').to_sym
+        @method   = options.fetch(:method, 'get').to_sym
         @filename = options.fetch(:filename, 'addon-manifest.json')
         @options  = options
       end
@@ -58,7 +58,7 @@ ENV
       end
 
       def skeleton
-        Yajl::Parser.parse skeleton_json
+        OkJson.decode skeleton_json
       end
 
       def write

data/lib/heroku/kensa/okjson.rb

@@ -0,0 +1,606 @@
+# Copyright 2011 Keith Rarick
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# See https://github.com/kr/okjson for updates.
+
+require 'stringio'
+
+# Some parts adapted from
+# http://golang.org/src/pkg/json/decode.go and
+# http://golang.org/src/pkg/utf8/utf8.go
+module OkJson
+  extend self
+
+
+  # Decodes a json document in string s and
+  # returns the corresponding ruby value.
+  # String s must be valid UTF-8. If you have
+  # a string in some other encoding, convert
+  # it first.
+  #
+  # String values in the resulting structure
+  # will be UTF-8.
+  def decode(s)
+    ts = lex(s)
+    v, ts = textparse(ts)
+    if ts.length > 0
+      raise Error, 'trailing garbage'
+    end
+    v
+  end
+
+
+  # Parses a "json text" in the sense of RFC 4627.
+  # Returns the parsed value and any trailing tokens.
+  # Note: this is almost the same as valparse,
+  # except that it does not accept atomic values.
+  def textparse(ts)
+    if ts.length < 0
+      raise Error, 'empty'
+    end
+
+    typ, _, val = ts[0]
+    case typ
+    when '{' then objparse(ts)
+    when '[' then arrparse(ts)
+    else
+      raise Error, "unexpected #{val.inspect}"
+    end
+  end
+
+
+  # Parses a "value" in the sense of RFC 4627.
+  # Returns the parsed value and any trailing tokens.
+  def valparse(ts)
+    if ts.length < 0
+      raise Error, 'empty'
+    end
+
+    typ, _, val = ts[0]
+    case typ
+    when '{' then objparse(ts)
+    when '[' then arrparse(ts)
+    when :val,:str then [val, ts[1..-1]]
+    else
+      raise Error, "unexpected #{val.inspect}"
+    end
+  end
+
+
+  # Parses an "object" in the sense of RFC 4627.
+  # Returns the parsed value and any trailing tokens.
+  def objparse(ts)
+    ts = eat('{', ts)
+    obj = {}
+
+    if ts[0][0] == '}'
+      return obj, ts[1..-1]
+    end
+
+    k, v, ts = pairparse(ts)
+    obj[k] = v
+
+    if ts[0][0] == '}'
+      return obj, ts[1..-1]
+    end
+
+    loop do
+      ts = eat(',', ts)
+
+      k, v, ts = pairparse(ts)
+      obj[k] = v
+
+      if ts[0][0] == '}'
+        return obj, ts[1..-1]
+      end
+    end
+  end
+
+
+  # Parses a "member" in the sense of RFC 4627.
+  # Returns the parsed values and any trailing tokens.
+  def pairparse(ts)
+    (typ, _, k), ts = ts[0], ts[1..-1]
+    if typ != :str
+      raise Error, "unexpected #{k.inspect}"
+    end
+    ts = eat(':', ts)
+    v, ts = valparse(ts)
+    [k, v, ts]
+  end
+
+
+  # Parses an "array" in the sense of RFC 4627.
+  # Returns the parsed value and any trailing tokens.
+  def arrparse(ts)
+    ts = eat('[', ts)
+    arr = []
+
+    if ts[0][0] == ']'
+      return arr, ts[1..-1]
+    end
+
+    v, ts = valparse(ts)
+    arr << v
+
+    if ts[0][0] == ']'
+      return arr, ts[1..-1]
+    end
+
+    loop do
+      ts = eat(',', ts)
+
+      v, ts = valparse(ts)
+      arr << v
+
+      if ts[0][0] == ']'
+        return arr, ts[1..-1]
+      end
+    end
+  end
+
+
+  def eat(typ, ts)
+    if ts[0][0] != typ
+      raise Error, "expected #{typ} (got #{ts[0].inspect})"
+    end
+    ts[1..-1]
+  end
+
+
+  # Scans s and returns a list of json tokens,
+  # excluding white space (as defined in RFC 4627).
+  def lex(s)
+    ts = []
+    while s.length > 0
+      typ, lexeme, val = tok(s)
+      if typ == nil
+        raise Error, "invalid character at #{s[0,10].inspect}"
+      end
+      if typ != :space
+        ts << [typ, lexeme, val]
+      end
+      s = s[lexeme.length..-1]
+    end
+    ts
+  end
+
+
+  # Scans the first token in s and
+  # returns a 3-element list, or nil
+  # if s does not begin with a valid token.
+  #
+  # The first list element is one of
+  # '{', '}', ':', ',', '[', ']',
+  # :val, :str, and :space.
+  #
+  # The second element is the lexeme.
+  #
+  # The third element is the value of the
+  # token for :val and :str, otherwise
+  # it is the lexeme.
+  def tok(s)
+    case s[0]
+    when ?{  then ['{', s[0,1], s[0,1]]
+    when ?}  then ['}', s[0,1], s[0,1]]
+    when ?:  then [':', s[0,1], s[0,1]]
+    when ?,  then [',', s[0,1], s[0,1]]
+    when ?[  then ['[', s[0,1], s[0,1]]
+    when ?]  then [']', s[0,1], s[0,1]]
+    when ?n  then nulltok(s)
+    when ?t  then truetok(s)
+    when ?f  then falsetok(s)
+    when ?"  then strtok(s)
+    when Spc then [:space, s[0,1], s[0,1]]
+    when ?\t then [:space, s[0,1], s[0,1]]
+    when ?\n then [:space, s[0,1], s[0,1]]
+    when ?\r then [:space, s[0,1], s[0,1]]
+    else          numtok(s)
+    end
+  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)
+    m = /-?([1-9][0-9]+|[0-9])([.][0-9]+)?([eE][+-]?[0-9]+)?/.match(s)
+    if m && m.begin(0) == 0
+      if m[3] && !m[2]
+        [:val, m[0], Integer(m[1])*(10**Integer(m[3][1..-1]))]
+      elsif m[2]
+        [:val, m[0], Float(m[0])]
+      else
+        [:val, m[0], Integer(m[0])]
+      end
+    end
+  end
+
+
+  def strtok(s)
+    m = /"([^"\\]|\\["\/\\bfnrt]|\\u[0-9a-fA-F]{4})*"/.match(s)
+    if ! m
+      raise Error, "invalid string literal at #{abbrev(s)}"
+    end
+    [:str, m[0], unquote(m[0])]
+  end
+
+
+  def abbrev(s)
+    t = s[0,10]
+    p = t['`']
+    t = t[0,p] if p
+    t = t + '...' if t.length < s.length
+    '`' + t + '`'
+  end
+
+
+  # Converts a quoted json string literal q into a UTF-8-encoded string.
+  # The rules are different than for Ruby, so we cannot use eval.
+  # 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
+    r, w = 0, 0
+    while r < q.length
+      c = q[r]
+      case true
+      when c == ?\\
+        r += 1
+        if r >= q.length
+          raise Error, "string literal ends with a \"\\\": \"#{q}\""
+        end
+
+        case q[r]
+        when ?",?\\,?/,?'
+          a[w] = q[r]
+          r += 1
+          w += 1
+        when ?b,?f,?n,?r,?t
+          a[w] = Unesc[q[r]]
+          r += 1
+          w += 1
+        when ?u
+          r += 1
+          uchar = begin
+            hexdec4(q[r,4])
+          rescue RuntimeError => e
+            raise Error, "invalid escape sequence \\u#{q[r,4]}: #{e}"
+          end
+          r += 4
+          if surrogate? uchar
+            if q.length >= r+6
+              uchar1 = hexdec4(q[r+2,4])
+              uchar = subst(uchar, uchar1)
+              if uchar != Ucharerr
+                # A valid pair; consume.
+                r += 6
+              end
+            end
+          end
+          w += ucharenc(a, w, uchar)
+        else
+          raise Error, "invalid escape char #{q[r]} in \"#{q}\""
+        end
+      when c == ?", c < Spc
+        raise Error, "invalid character in string literal \"#{q}\""
+      else
+        # Copy anything else byte-for-byte.
+        # Valid UTF-8 will remain valid UTF-8.
+        # Invalid UTF-8 will remain invalid UTF-8.
+        a[w] = c
+        r += 1
+        w += 1
+      end
+    end
+    a[0,w]
+  end
+
+
+  # Encodes unicode character u as UTF-8
+  # bytes in string a at position i.
+  # Returns the number of bytes written.
+  def ucharenc(a, i, u)
+    case true
+    when u <= Uchar1max
+      a[i] = (u & 0xff).chr
+      1
+    when u <= Uchar2max
+      a[i+0] = (Utag2 | ((u>>6)&0xff)).chr
+      a[i+1] = (Utagx | (u&Umaskx)).chr
+      2
+    when u <= Uchar3max
+      a[i+0] = (Utag3 | ((u>>12)&0xff)).chr
+      a[i+1] = (Utagx | ((u>>6)&Umaskx)).chr
+      a[i+2] = (Utagx | (u&Umaskx)).chr
+      3
+    else
+      a[i+0] = (Utag4 | ((u>>18)&0xff)).chr
+      a[i+1] = (Utagx | ((u>>12)&Umaskx)).chr
+      a[i+2] = (Utagx | ((u>>6)&Umaskx)).chr
+      a[i+3] = (Utagx | (u&Umaskx)).chr
+      4
+    end
+  end
+
+
+  def hexdec4(s)
+    if s.length != 4
+      raise Error, 'short'
+    end
+    (nibble(s[0])<<12) | (nibble(s[1])<<8) | (nibble(s[2])<<4) | nibble(s[3])
+  end
+
+
+  def subst(u1, u2)
+    if Usurr1 <= u1 && u1 < Usurr2 && Usurr2 <= u2 && u2 < Usurr3
+      return ((u1-Usurr1)<<10) | (u2-Usurr2) + Usurrself
+    end
+    return Ucharerr
+  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
+
+
+  def nibble(c)
+    case true
+    when ?0 <= c && c <= ?9 then c.ord - ?0.ord
+    when ?a <= c && c <= ?z then c.ord - ?a.ord + 10
+    when ?A <= c && c <= ?Z then c.ord - ?A.ord + 10
+    else
+      raise Error, "invalid hex code #{c}"
+    end
+  end
+
+
+  # Encodes x into a json text. It may contain only
+  # Array, Hash, String, Numeric, true, false, nil.
+  # (Note, this list excludes Symbol.)
+  # X itself must be an Array or a Hash.
+  # No other value can be encoded, and an error will
+  # be raised if x contains any other value, such as
+  # Nan, Infinity, Symbol, and Proc, or if a Hash key
+  # is not a String.
+  # Strings contained in x must be valid UTF-8.
+  def encode(x)
+    case x
+    when Hash    then objenc(x)
+    when Array   then arrenc(x)
+    else
+      raise Error, 'root value must be an Array or a Hash'
+    end
+  end
+
+
+  def valenc(x)
+    case x
+    when Hash    then objenc(x)
+    when Array   then arrenc(x)
+    when String  then strenc(x)
+    when Numeric then numenc(x)
+    when true    then "true"
+    when false   then "false"
+    when nil     then "null"
+    else
+      raise Error, "cannot encode #{x.class}: #{x.inspect}"
+    end
+  end
+
+
+  def objenc(x)
+    '{' + x.map{|k,v| keyenc(k) + ':' + valenc(v)}.join(',') + '}'
+  end
+
+
+  def arrenc(a)
+    '[' + a.map{|x| valenc(x)}.join(',') + ']'
+  end
+
+
+  def keyenc(k)
+    case k
+    when String then strenc(k)
+    else
+      raise Error, "Hash key is not a string: #{k.inspect}"
+    end
+  end
+
+
+  def strenc(s)
+    t = StringIO.new
+    t.putc(?")
+    r = 0
+    while r < s.length
+      case s[r]
+      when ?"  then t.print('\\"')
+      when ?\\ then t.print('\\\\')
+      when ?\b then t.print('\\b')
+      when ?\f then t.print('\\f')
+      when ?\n then t.print('\\n')
+      when ?\r then t.print('\\r')
+      when ?\t then t.print('\\t')
+      else
+        c = s[r]
+        case true
+        when Spc <= c && c <= ?~
+          t.putc(c)
+        when true
+          u, size = uchardec(s, r)
+          r += size - 1 # we add one more at the bottom of the loop
+          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
+        else
+          # invalid byte; skip it
+        end
+      end
+      r += 1
+    end
+    t.putc(?")
+    t.string
+  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}"
+    end
+    "#{x}"
+  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)
+    n = s.length - i
+    return [Ucharerr, 1] if n < 1
+
+    c0 = s[i].ord
+
+    # 1-byte, 7-bit sequence?
+    if c0 < Utagx
+      return [c0, 1]
+    end
+
+    # unexpected continuation byte?
+    return [Ucharerr, 1] if c0 < Utag2
+
+    # need continuation byte
+    return [Ucharerr, 1] if n < 2
+    c1 = s[i+1].ord
+    return [Ucharerr, 1] 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]
+    end
+
+    # need second continuation byte
+    return [Ucharerr, 1] if n < 3
+    c2 = s[i+2].ord
+    return [Ucharerr, 1] 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]
+    end
+
+    # need third continuation byte
+    return [Ucharerr, 1] if n < 4
+    c3 = s[i+3].ord
+    return [Ucharerr, 1] 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
+
+    return [Ucharerr, 1]
+  end
+
+
+  class Error < ::StandardError
+  end
+
+
+  Utagx = 0x80 # 1000 0000
+  Utag2 = 0xc0 # 1100 0000
+  Utag3 = 0xe0 # 1110 0000
+  Utag4 = 0xf0 # 1111 0000
+  Utag5 = 0xF8 # 1111 1000
+  Umaskx = 0x3f # 0011 1111
+  Umask2 = 0x1f # 0001 1111
+  Umask3 = 0x0f # 0000 1111
+  Umask4 = 0x07 # 0000 0111
+  Uchar1max = (1<<7) - 1
+  Uchar2max = (1<<11) - 1
+  Uchar3max = (1<<16) - 1
+  Ucharerr = 0xFFFD # 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
+
+class Hash
+  def stringify_keys
+    new_hash = {}
+    each do |key, value|
+      case value
+      when Hash
+        value = value.stringify_keys 
+      when Array
+        value = value.map { |v| v.stringify_keys if v.is_a? Hash } 
+      end
+
+      new_hash[key.to_s] = value
+    end
+    new_hash
+  end
+end
+
+module OkJson
+  alias encode_without_stringify encode
+
+  def encode(x)
+    encode_without_stringify(x.stringify_keys)
+  end  
+end