heroku-api 0.2.7 → 0.2.8

data/changelog.txt

@@ -1,3 +1,8 @@
+0.2.8 07/08/2012
+================
+
+return to OkJson usage, as json breaks with some legacy toolbelt installs
+
 0.2.7 07/05/2012
 ================
 

data/lib/heroku/api.rb

@@ -9,6 +9,8 @@ unless $LOAD_PATH.include?(__LIB_DIR__)
   $LOAD_PATH.unshift(__LIB_DIR__)
 end
 
+require "heroku/api/vendor/okjson"
+
 require "heroku/api/errors"
 require "heroku/api/mock"
 require "heroku/api/version"
@@ -32,36 +34,6 @@ srand
 module Heroku
   class API
 
-    begin
-
-      require('json')
-
-      def self.json_decode(json)
-        JSON.parse(json)
-      rescue
-        json
-      end
-
-      def self.json_encode(object)
-        JSON.dump(object)
-      end
-
-    rescue LoadError
-
-      require('heroku/api/vendor/okjson')
-
-      def self.json_decode(json)
-        Heroku::API::OkJson.decode(json)
-      rescue
-        json
-      end
-
-      def self.json_encode(object)
-        Heroku::API::OkJson.encode(object)
-      end
-
-    end
-
     def initialize(options={})
       @api_key = options.delete(:api_key) || ENV['HEROKU_API_KEY']
       user_pass = ":#{@api_key}"
@@ -109,7 +81,9 @@ module Heroku
           response.body = Zlib::GzipReader.new(StringIO.new(response.body)).read
         end
         begin
-          response.body = Heroku::API.json_decode(response.body)
+          response.body = Heroku::API::OkJson.decode(response.body)
+        rescue
+          # leave non-JSON body as is
         end
       end
 

data/lib/heroku/api/config_vars.rb

@@ -22,7 +22,7 @@ module Heroku
     # PUT /apps/:app/config_vars
     def put_config_vars(app, vars)
       request(
-        :body     => Heroku::API.json_encode(vars),
+        :body     => Heroku::API::OkJson.encode(vars),
         :expects  => 200,
         :method   => :put,
         :path     => "/apps/#{app}/config_vars"

data/lib/heroku/api/mock.rb

@@ -72,7 +72,7 @@ module Heroku
       def self.get_mock_addon(mock_data, addon)
         @addons ||= begin
           data = File.read("#{File.dirname(__FILE__)}/mock/cache/get_addons.json")
-          Heroku::API.json_decode(data)
+          Heroku::API::OkJson.decode(data)
         end
         @addons.detect {|addon_data| addon_data['name'] == addon}
       end
@@ -106,7 +106,7 @@ module Heroku
       def self.get_mock_feature(mock_data, feature)
         @features ||= begin
           data = File.read("#{File.dirname(__FILE__)}/mock/cache/get_features.json")
-          Heroku::API.json_decode(data)
+          Heroku::API::OkJson.decode(data)
         end
         @features.detect {|feature_data| feature_data['name'] == feature}
       end
@@ -139,7 +139,7 @@ module Heroku
 
         parsed = params.dup
         begin # try to JSON decode
-          parsed[:body] &&= Heroku::API.json_decode(parsed[:body])
+          parsed[:body] &&= Heroku::API::OkJson.decode(parsed[:body])
         rescue # else leave as is
         end
 

data/lib/heroku/api/mock/addons.rb

@@ -14,7 +14,7 @@ module Heroku
               # addon is currently installed
               remove_mock_app_addon(mock_data, app, addon)
               {
-                :body   => Heroku::API.json_encode({
+                :body   => Heroku::API::OkJson.encode({
                   "message" => nil,
                   "price"   => get_mock_addon_price(mock_data, addon),
                   "status"  => 'Uninstalled'
@@ -24,14 +24,14 @@ module Heroku
             else
               # addon is not currently installed
               {
-                :body   => Heroku::API.json_encode({'error' => "The add-on #{addon} is not installed for this app. Did you mean:\n\t#{addon_names.join("\n\t")}"}),
+                :body   => Heroku::API::OkJson.encode({'error' => "The add-on #{addon} is not installed for this app. Did you mean:\n\t#{addon_names.join("\n\t")}"}),
                 :status => 422
               }
             end
           else
             # addon does not exist
             {
-              :body   => Heroku::API.json_encode({'error' => "Could not find add-on #{addon}. Did you mean:\n\t#{addon_names.join("\n\t")}"}),
+              :body   => Heroku::API::OkJson.encode({'error' => "Could not find add-on #{addon}. Did you mean:\n\t#{addon_names.join("\n\t")}"}),
               :status => 422
             }
           end
@@ -53,7 +53,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do
           {
-            :body   => Heroku::API.json_encode(mock_data[:addons][app].map {|addon| addon['configured'] = true; addon}),
+            :body   => Heroku::API::OkJson.encode(mock_data[:addons][app].map {|addon| addon['configured'] = true; addon}),
             :status => 200
           }
         end
@@ -72,7 +72,7 @@ module Heroku
                 # addon is not currently installed
                 add_mock_app_addon(mock_data, app, addon)
                 {
-                  :body   => Heroku::API.json_encode({
+                  :body   => Heroku::API::OkJson.encode({
                     "message" => nil,
                     "price"   => get_mock_addon_price(mock_data, addon),
                     "status"  => 'Installed'
@@ -82,21 +82,21 @@ module Heroku
               else
                 # addon is currently installed
                 {
-                  :body   => Heroku::API.json_encode({'error' => "Add-on already installed."}),
+                  :body   => Heroku::API::OkJson.encode({'error' => "Add-on already installed."}),
                   :status => 422
                 }
               end
             else
               # addon of same type exists
               {
-                :body   => Heroku::API.json_encode({'error' => "#{app_addon_type_data['name']} add-on already added.\nTo upgrade, use addons:upgrade instead.\n"}),
+                :body   => Heroku::API::OkJson.encode({'error' => "#{app_addon_type_data['name']} add-on already added.\nTo upgrade, use addons:upgrade instead.\n"}),
                 :status => 422
               }
             end
           else
             # addon does not exist
             {
-              :body   => Heroku::API.json_encode({'error' => "Add-on not found."}),
+              :body   => Heroku::API::OkJson.encode({'error' => "Add-on not found."}),
               :status => 404
             }
           end
@@ -117,7 +117,7 @@ module Heroku
                 mock_data[:addons][app].delete(app_addon_data)
                 add_mock_app_addon(mock_data, app, addon)
                 {
-                  :body   => Heroku::API.json_encode({
+                  :body   => Heroku::API::OkJson.encode({
                     "message" => 'Plan upgraded',
                     "price"   => get_mock_addon_price(mock_data, addon),
                     "status"  => 'Updated'
@@ -127,21 +127,21 @@ module Heroku
               else
                 # addon is currently installed
                 {
-                  :body   => Heroku::API.json_encode({'error' => "Add-on already installed."}),
+                  :body   => Heroku::API::OkJson.encode({'error' => "Add-on already installed."}),
                   :status => 422
                 }
               end
             else
               # addon of same type not installed
               {
-                :body   => Heroku::API.json_encode({'error' => "Can't upgrade, no #{addon.split(':').join(' ')} add-on has been added.\nTo add, use addons:add instead.\n"}),
+                :body   => Heroku::API::OkJson.encode({'error' => "Can't upgrade, no #{addon.split(':').join(' ')} add-on has been added.\nTo add, use addons:add instead.\n"}),
                 :status => 422
               }
             end
           else
             # addon does not exist
             {
-              :body   => Heroku::API.json_encode({'error' => "Add-on not found."}),
+              :body   => Heroku::API::OkJson.encode({'error' => "Add-on not found."}),
               :status => 404
             }
           end

data/lib/heroku/api/mock/apps.rb

@@ -15,7 +15,7 @@ module Heroku
           mock_data[:ps].delete(app)
           mock_data[:releases].delete(app)
           {
-            :body   => Heroku::API.json_encode({}),
+            :body   => Heroku::API::OkJson.encode({}),
             :status => 200
           }
         end
@@ -25,7 +25,7 @@ module Heroku
       Excon.stub(:expects => 200, :method => :get, :path => '/apps') do |params|
         request_params, mock_data = parse_stub_params(params)
         {
-          :body   => Heroku::API.json_encode(mock_data[:apps]),
+          :body   => Heroku::API::OkJson.encode(mock_data[:apps]),
           :status => 200
         }
       end
@@ -36,7 +36,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do |app_data|
           {
-            :body   => Heroku::API.json_encode(app_data),
+            :body   => Heroku::API::OkJson.encode(app_data),
             :status => 200
           }
         end
@@ -49,7 +49,7 @@ module Heroku
 
         if get_mock_app(mock_data, app)
           {
-            :body => Heroku::API.json_encode('error' => 'Name is already taken'),
+            :body => Heroku::API::OkJson.encode('error' => 'Name is already taken'),
             :status => 422
           }
         else
@@ -112,7 +112,7 @@ module Heroku
           end
 
           {
-            :body   => Heroku::API.json_encode(app_data),
+            :body   => Heroku::API::OkJson.encode(app_data),
             :status => 202
           }
         end
@@ -157,12 +157,12 @@ module Heroku
           end
           if email && !collaborator
             {
-              :body   => Heroku::API.json_encode('error' => 'Only existing collaborators can receive ownership for an app'),
+              :body   => Heroku::API::OkJson.encode('error' => 'Only existing collaborators can receive ownership for an app'),
               :status => 422
             }
           else
             {
-              :body   => Heroku::API.json_encode('name' => app_data['name']),
+              :body   => Heroku::API::OkJson.encode('name' => app_data['name']),
               :status => 200
             }
           end
@@ -176,7 +176,7 @@ module Heroku
 
         with_mock_app(mock_data, app) do |app_data|
           {
-            :body   => Heroku::API.json_encode({}),
+            :body   => Heroku::API::OkJson.encode({}),
             :status => 201
           }
         end

data/lib/heroku/api/mock/collaborators.rb

@@ -25,7 +25,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do
           {
-            :body   => Heroku::API.json_encode(mock_data[:collaborators][app]),
+            :body   => Heroku::API::OkJson.encode(mock_data[:collaborators][app]),
             :status => 200
           }
         end

data/lib/heroku/api/mock/config_vars.rb

@@ -10,7 +10,7 @@ module Heroku
           mock_data[:config_vars][app].delete(key)
           add_mock_release(mock_data, app, {'descr' => "Config remove #{key}"})
           {
-            :body   => Heroku::API.json_encode(mock_data[:config_vars][app]),
+            :body   => Heroku::API::OkJson.encode(mock_data[:config_vars][app]),
             :status => 200
           }
         end
@@ -22,7 +22,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do
           {
-            :body   => Heroku::API.json_encode(mock_data[:config_vars][app]),
+            :body   => Heroku::API::OkJson.encode(mock_data[:config_vars][app]),
             :status => 200
           }
         end
@@ -37,7 +37,7 @@ module Heroku
           mock_data[:config_vars][app].merge!(new_config_vars)
           add_mock_release(mock_data, app, {'descr' => "Config add #{new_config_vars.keys.join(', ')}"})
           {
-            :body   => Heroku::API.json_encode(mock_data[:config_vars][app]),
+            :body   => Heroku::API::OkJson.encode(mock_data[:config_vars][app]),
             :status => 200
           }
         end

data/lib/heroku/api/mock/domains.rb

@@ -42,7 +42,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do |app_data|
           {
-            :body   => Heroku::API.json_encode(mock_data[:domains][app]),
+            :body   => Heroku::API::OkJson.encode(mock_data[:domains][app]),
             :status => 200
           }
         end
@@ -66,7 +66,7 @@ module Heroku
             }
           end
           {
-            :body   => Heroku::API.json_encode('domain' => domain),
+            :body   => Heroku::API::OkJson.encode('domain' => domain),
             :status => 201
           }
         end

data/lib/heroku/api/mock/features.rb

@@ -16,20 +16,20 @@ module Heroku
             when 'app'
               mock_data[:features][:app][app].delete(feature_data)
               {
-                :body   => Heroku::API.json_encode(feature_data.merge('enabled' => false)),
+                :body   => Heroku::API::OkJson.encode(feature_data.merge('enabled' => false)),
                 :status => 200
               }
             when 'user'
               mock_data[:features][:user].delete(feature_data.merge('enabled' => false))
               {
-                :body   => Heroku::API.json_encode(feature_data),
+                :body   => Heroku::API::OkJson.encode(feature_data),
                 :status => 200
               }
             end
           else
             # feature does not exist
             {
-              :body   => Heroku::API.json_encode({'error' => "Feature not found."}),
+              :body   => Heroku::API::OkJson.encode({'error' => "Feature not found."}),
               :status => 404
             }
           end
@@ -56,13 +56,13 @@ module Heroku
         feature, _ = request_params[:captures][:path]
         if feature_data = get_mock_feature(mock_data, feature)
           {
-            :body   => Heroku::API.json_encode(feature_data),
+            :body   => Heroku::API::OkJson.encode(feature_data),
             :status => 200
           }
         else
           # feature does not exist
           {
-            :body   => Heroku::API.json_encode({'error' => "Feature not found."}),
+            :body   => Heroku::API::OkJson.encode({'error' => "Feature not found."}),
             :status => 404
           }
         end
@@ -82,7 +82,7 @@ module Heroku
             when 'app'
               mock_data[:features][:app][app] << feature_data
               {
-                :body   => Heroku::API.json_encode(feature_data),
+                :body   => Heroku::API::OkJson.encode(feature_data),
                 :status => 200
               }
             when 'user'
@@ -95,7 +95,7 @@ module Heroku
           else
             # feature does not exist
             {
-              :body   => Heroku::API.json_encode({'error' => "Feature not found."}),
+              :body   => Heroku::API::OkJson.encode({'error' => "Feature not found."}),
               :status => 404
             }
           end

data/lib/heroku/api/mock/keys.rb

@@ -26,7 +26,7 @@ module Heroku
       Excon.stub(:expects => 200, :method => :get, :path => %r{^/user/keys}) do |params|
         request_params, mock_data = parse_stub_params(params)
         {
-          :body   => Heroku::API.json_encode(mock_data[:keys]),
+          :body   => Heroku::API::OkJson.encode(mock_data[:keys]),
           :status => 200
         }
       end

data/lib/heroku/api/mock/processes.rb

@@ -8,7 +8,7 @@ module Heroku
       app, _ = request_params[:captures][:path]
       with_mock_app(mock_data, app) do |app_data|
         {
-          :body   => Heroku::API.json_encode(get_mock_processes(mock_data, app)),
+          :body   => Heroku::API::OkJson.encode(get_mock_processes(mock_data, app)),
           :status => 200
         }
       end
@@ -43,7 +43,7 @@ module Heroku
         }
         mock_data[:ps][app] << data
         {
-          :body   => Heroku::API.json_encode(data),
+          :body   => Heroku::API::OkJson.encode(data),
           :status => 200,
         }
       end
@@ -117,13 +117,13 @@ module Heroku
             }
           else
             {
-              :body   => Heroku::API.json_encode('error' => "No such type as #{type}") ,
+              :body   => Heroku::API::OkJson.encode('error' => "No such type as #{type}") ,
               :status => 422
             }
           end
         else
           {
-            :body   => Heroku::API.json_encode('error' => "That feature is not available on this app's stack"),
+            :body   => Heroku::API::OkJson.encode('error' => "That feature is not available on this app's stack"),
             :status => 422
           }
         end
@@ -139,7 +139,7 @@ module Heroku
         type  = request_params[:query].has_key?('type') && request_params[:query]['type']
         if !ps && !type
           {
-            :body   => Heroku::API.json_encode({'error' => 'Missing process argument'}),
+            :body   => Heroku::API::OkJson.encode({'error' => 'Missing process argument'}),
             :status => 422
           }
         else
@@ -160,12 +160,12 @@ module Heroku
         unless app_data['stack'] == 'cedar'
           app_data['dynos'] = dynos
           {
-            :body   => Heroku::API.json_encode({'name' => app, 'dynos' => dynos}),
+            :body   => Heroku::API::OkJson.encode({'name' => app, 'dynos' => dynos}),
             :status => 200
           }
         else
           {
-            :body   => Heroku::API.json_encode({'error' => "For Cedar apps, use `heroku scale web=#{dynos}`"}),
+            :body   => Heroku::API::OkJson.encode({'error' => "For Cedar apps, use `heroku scale web=#{dynos}`"}),
             :status => 422
           }
         end
@@ -181,12 +181,12 @@ module Heroku
         unless app_data['stack'] == 'cedar'
           app_data['workers'] = workers
           {
-            :body   => Heroku::API.json_encode({'name' => app, 'workers' => workers}),
+            :body   => Heroku::API::OkJson.encode({'name' => app, 'workers' => workers}),
             :status => 200
           }
         else
           {
-            :body   => Heroku::API.json_encode({'error' => "For Cedar apps, use `heroku scale worker=#{workers}`"}),
+            :body   => Heroku::API::OkJson.encode({'error' => "For Cedar apps, use `heroku scale worker=#{workers}`"}),
             :status => 422
           }
         end

data/lib/heroku/api/mock/releases.rb

@@ -8,7 +8,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do |app_data|
           {
-            :body   => Heroku::API.json_encode(mock_data[:releases][app]),
+            :body   => Heroku::API::OkJson.encode(mock_data[:releases][app]),
             :status => 200
           }
         end
@@ -22,7 +22,7 @@ module Heroku
           releases = mock_data[:releases][app]
           if release_data = (release_name == 'current' && releases.last) || releases.detect {|release| release['name'] == release_name}
             {
-              :body   => Heroku::API.json_encode(release_data),
+              :body   => Heroku::API::OkJson.encode(release_data),
               :status => 200
             }
           else
@@ -51,7 +51,7 @@ module Heroku
               }
             else
               {
-                :body   => Heroku::API.json_encode({'error' => 'Cannot rollback to a release that had a different set of addons installed'}),
+                :body   => Heroku::API::OkJson.encode({'error' => 'Cannot rollback to a release that had a different set of addons installed'}),
                 :status => 422
               }
             end

data/lib/heroku/api/mock/stacks.rb

@@ -37,7 +37,7 @@ module Heroku
           stack_data = Marshal::load(Marshal.dump(STACKS))
           stack_data.detect {|stack| stack['name'] == app_data['stack']}['current'] = true
           {
-            :body   => Heroku::API.json_encode(stack_data),
+            :body   => Heroku::API::OkJson.encode(stack_data),
             :status => 200
           }
         end
@@ -65,13 +65,13 @@ BODY
               }
             else
               {
-                :body   => Heroku::API.json_encode('error' => 'Stack not found'),
+                :body   => Heroku::API::OkJson.encode('error' => 'Stack not found'),
                 :status => 404
               }
             end
           else
             {
-              :body   => Heroku::API.json_encode('error' => 'Stack migration to/from Cedar is not available. Create a new app with --stack cedar instead.'),
+              :body   => Heroku::API::OkJson.encode('error' => 'Stack migration to/from Cedar is not available. Create a new app with --stack cedar instead.'),
               :status => 422
             }
           end

data/lib/heroku/api/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   class API
-    VERSION = "0.2.7"
+    VERSION = "0.2.8"
   end
 end

data/test/test_addons.rb

@@ -43,7 +43,7 @@ class TestAddons < MiniTest::Unit::TestCase
     data = File.read("#{File.dirname(__FILE__)}/../lib/heroku/api/mock/cache/get_addons.json")
 
     assert_equal(200, response.status)
-    assert_equal(Heroku::API.json_decode(data), response.body)
+    assert_equal(Heroku::API::OkJson.decode(data), response.body)
   end
 
   def test_get_addons_with_app

data/test/test_features.rb

@@ -5,7 +5,7 @@ class TestFeatures < MiniTest::Unit::TestCase
   def setup
     @feature_data ||= begin
       data = File.read("#{File.dirname(__FILE__)}/../lib/heroku/api/mock/cache/get_features.json")
-      features_data = Heroku::API.json_decode(data)
+      features_data = Heroku::API::OkJson.decode(data)
       features_data.detect {|feature| feature['name'] == 'user_env_compile'}
     end
   end
@@ -40,7 +40,7 @@ class TestFeatures < MiniTest::Unit::TestCase
       data = File.read("#{File.dirname(__FILE__)}/../lib/heroku/api/mock/cache/get_features.json")
 
       assert_equal(200, response.status)
-      assert_equal(Heroku::API.json_decode(data), response.body)
+      assert_equal(Heroku::API::OkJson.decode(data), response.body)
     end
   end
 

data/test/test_user.rb

@@ -7,7 +7,7 @@ class TestUser < MiniTest::Unit::TestCase
     data = File.read("#{File.dirname(__FILE__)}/../lib/heroku/api/mock/cache/get_user.json")
 
     assert_equal(200, response.status)
-    assert_equal(Heroku::API.json_decode(data), response.body)
+    assert_equal(Heroku::API::OkJson.decode(data), response.body)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-api
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70181884166000 !ruby/object:Gem::Requirement
+  requirement: &70218833874580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.3
   type: :runtime
   prerelease: false
-  version_requirements: *70181884166000
+  version_requirements: *70218833874580
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70181884165300 !ruby/object:Gem::Requirement
+  requirement: &70218833873800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181884165300
+  version_requirements: *70218833873800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70181884164420 !ruby/object:Gem::Requirement
+  requirement: &70218833885800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181884164420
+  version_requirements: *70218833885800
 description: Ruby Client for the Heroku API
 email:
 - wesley@heroku.com
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3317431445359256884
+      hash: 4155132943236382125
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3317431445359256884
+      hash: 4155132943236382125
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15