heroku-api 0.2.13 → 0.3.0

data/changelog.txt

@@ -1,3 +1,9 @@
+0.3.0 07/20/2012
+================
+
+fixes for url segment escaping of config_vars, domains and keys
+add get_app_maintenance
+
 0.2.13 07/18/2012
 =================
 

data/lib/heroku/api.rb

@@ -110,6 +110,10 @@ module Heroku
       end
     end
 
+    def escape(string)
+      CGI.escape(string).gsub('.', '%2E')
+    end
+
     def ps_options(params)
       if ps_env = params.delete(:ps_env) || params.delete('ps_env')
         ps_env.each do |key, value|

data/lib/heroku/api/apps.rb

@@ -28,6 +28,15 @@ module Heroku
       )
     end
 
+    # GET /apps/:app/server/maintenance
+    def get_app_maintenance(app)
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :path     => "/apps/#{app}/server/maintenance"
+      )
+    end
+
     # POST /apps
     def post_app(params={})
       request(

data/lib/heroku/api/config_vars.rb

@@ -6,7 +6,7 @@ module Heroku
       request(
         :expects  => 200,
         :method   => :delete,
-        :path     => "/apps/#{app}/config_vars/#{key}"
+        :path     => "/apps/#{app}/config_vars/#{escape(key)}"
       )
     end
 

data/lib/heroku/api/domains.rb

@@ -6,7 +6,7 @@ module Heroku
       request(
         :expects  => 200,
         :method   => :delete,
-        :path     => "/apps/#{app}/domains/#{CGI.escape(domain)}"
+        :path     => "/apps/#{app}/domains/#{escape(domain)}"
       )
     end
 

data/lib/heroku/api/keys.rb

@@ -6,7 +6,7 @@ module Heroku
       request(
         :expects  => 200,
         :method   => :delete,
-        :path     => "/user/keys/#{CGI.escape(key).gsub('.','%2E')}"
+        :path     => "/user/keys/#{escape(key)}"
       )
     end
 

data/lib/heroku/api/mock.rb

@@ -152,6 +152,10 @@ module Heroku
         add_mock_release(mock_data, app, {'descr' => "Add-on remove #{addon_data['name']}"})
       end
 
+      def self.unescape(string)
+        CGI.unescape(string)
+      end
+
       def self.with_mock_app(mock_data, app, &block)
         if app_data = get_mock_app(mock_data, app)
           yield(app_data)

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

@@ -42,6 +42,20 @@ module Heroku
         end
       end
 
+      # stub GET /apps/:app/server/maintenance
+      Excon.stub(:expects => 200, :method => :get, :path => %r{^/apps/([^/]+)/server/maintenance$}) do |params|
+        request_params, mock_data = parse_stub_params(params)
+        app, _ = request_params[:captures][:path].first
+
+        with_mock_app(mock_data, app) do
+          maintenance = mock_data[:maintenance_mode].include?(app)
+          {
+            :body   => Heroku::API::OkJson.encode('maintenance' => maintenance),
+            :status => 200
+          }
+        end
+      end
+
       # stub POST /apps
       Excon.stub(:expects => 202, :method => :post, :path => '/apps') do |params|
         request_params, mock_data = parse_stub_params(params)

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

@@ -6,6 +6,7 @@ module Heroku
       Excon.stub(:expects => 200, :method => :delete, :path => %r{^/apps/([^/]+)/config_vars/([^/]+)$}) do |params|
         request_params, mock_data = parse_stub_params(params)
         app, key, _ = request_params[:captures][:path]
+        key = unescape(key)
         with_mock_app(mock_data, app) do
           mock_data[:config_vars][app].delete(key)
           add_mock_release(mock_data, app, {'descr' => "Config remove #{key}"})

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

@@ -6,7 +6,7 @@ module Heroku
       Excon.stub(:expects => 200, :method => :delete, :path => %r{^/apps/([^/]+)/domains/([^/]+)$} ) do |params|
         request_params, mock_data = parse_stub_params(params)
         app, domain, _ = request_params[:captures][:path]
-        domain = CGI.unescape(domain)
+        domain = unescape(domain)
         with_mock_app(mock_data, app) do |app_data|
           if domain = get_mock_app_domain(mock_data, app, domain)
             mock_data[:domains][app].delete(domain)

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

@@ -6,7 +6,7 @@ module Heroku
       Excon.stub(:expects => 200, :method => :delete, :path => %r{^/user/keys/([^/]+)}) do |params|
         request_params, mock_data = parse_stub_params(params)
         key, _ = request_params[:captures][:path]
-        key = CGI.unescape(key).gsub('%2E', '.')
+        key = unescape(key)
         if key_data = get_mock_key(mock_data, key)
           mock_data[:keys].delete(key_data)
           { :status => 200 }

data/lib/heroku/api/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   class API
-    VERSION = "0.2.13"
+    VERSION = "0.3.0"
   end
 end

data/test/test_apps.rb

@@ -38,6 +38,15 @@ class TestApps < MiniTest::Unit::TestCase
     end
   end
 
+  def test_get_app_maintenance
+    with_app do |app_data|
+      response = heroku.get_app_maintenance(app_data['name'])
+
+      assert_equal(200, response.status)
+      assert_equal({'maintenance' => false}, response.body)
+    end
+  end
+
   def test_post_app
     response = heroku.post_app
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-api
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &2168633640 !ruby/object:Gem::Requirement
+  requirement: &70155015136000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.15.4
   type: :runtime
   prerelease: false
-  version_requirements: *2168633640
+  version_requirements: *70155015136000
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2168631580 !ruby/object:Gem::Requirement
+  requirement: &70155015135020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168631580
+  version_requirements: *70155015135020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2168629320 !ruby/object:Gem::Requirement
+  requirement: &70155015134300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168629320
+  version_requirements: *70155015134300
 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: 4095133132092254546
+      hash: -2807830283804152461
 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: 4095133132092254546
+      hash: -2807830283804152461
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15