heroku-client 0.0.1 → 0.0.2

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 *.swp
+*.swo

data/lib/heroku-client.rb

@@ -2,6 +2,7 @@ require "httparty"
 require "json"
 
 require "heroku-client/version"
+require "heroku-client/json_util"
 require "heroku-client/heroku_obj"
 require "heroku-client/http"
 require "heroku-client/api"

data/lib/heroku-client/api.rb

@@ -13,6 +13,37 @@ module Heroku
         raise "Invalid number of parameters"
       end
 
+      def create_app(params = {})
+        post_params = {}
+
+        [:name, :stack].each do |k|
+          post_params["app[#{k}]"] = params[k] if params.has_key? k
+        end
+
+        post "apps", post_params
+      end
+
+      def rename_app(old_app_name, new_app_name)
+        put_params = {}
+
+        put_params["name"] = old_app_name
+        put_params["app[name]"] = new_app_name
+
+        put "apps/#{old_app_name}", put_params
+      end
+
+      def transfer_app(app_name, new_owner)
+        put_params = {}
+
+        put_params["app[transfer_owner]"] = new_owner
+
+        put "apps/#{app_name}", put_params
+      end
+
+      def delete_app(app_name)
+        delete "apps/#{app_name}"
+      end
+
       def collaborators(app_name)
         return get("apps/#{app_name}/collaborators")
       end

data/lib/heroku-client/http.rb

@@ -2,27 +2,62 @@ module Heroku
   module Client
     module Http
       def get(uri)
+        request :get, uri
+      end
+
+      def post(uri, body)
+        request :post, uri, body
+      end
+
+      def put(uri, body)
+        request :put, uri, body
+      end
+
+      def delete(uri)
+        request :delete, uri
+      end
+
+      def request(method, uri, body = {})
         headers = { "Accept" => "application/json"}
-        resp = HTTParty.get "https://api.heroku.com/#{uri}", { basic_auth: { password: apikey }, headers: headers}
+        basic_auth = { password: apikey }
 
-        raise UnauthorizedError if resp.code == 401
-        raise PaymentRequiredError if resp.code == 402
-        raise ForbiddenError if resp.code == 403
-        raise NotFoundError if resp.code == 404
-        raise PreConditionFailedError if resp.code == 412
-        raise UnprocessableEntityError if resp.code == 422
-        raise LockedError if resp.code == 423
+        options = { basic_auth: basic_auth, headers: headers }
 
-        raise UnknownError unless resp.success?
+        options[:body] = body unless body.empty?
 
-        parsed = JSON.parse(resp.body)
+        url = "https://api.heroku.com/#{uri}"
+
+        resp = HTTParty.get url, options if method == :get
+        resp = HTTParty.post url, options if method == :post
+        resp = HTTParty.put url, options if method == :put
+        resp = HTTParty.delete url, options if method == :delete
+
+        unless resp.success?
+          error_message = json_util.parse_error(resp.body)
+
+          raise UnauthorizedError, error_message if resp.code == 401
+          raise PaymentRequiredError, error_message if resp.code == 402
+          raise ForbiddenError, error_message if resp.code == 403
+          raise NotFoundError, error_message if resp.code == 404
+          raise PreConditionFailedError, error_message if resp.code == 412
+          raise UnprocessableEntityError, error_message if resp.code == 422
+          raise LockedError, error_message if resp.code == 423
 
+          raise UnknownError
+        end
+
+        parsed = JSON.parse(resp.body)
         parsed = parsed.map { |o| HerokuObj.new(o) } if parsed.is_a? Array
 
         parsed = HerokuObj.new parsed if parsed.is_a? Hash
 
         parsed
       end
+
+      private
+      def json_util
+        @json_util ||= JSONUtil.new
+      end
     end
 
     class UnauthorizedError < Exception

data/lib/heroku-client/json_util.rb

@@ -0,0 +1,26 @@
+module Heroku
+  module Client
+    class JSONUtil
+
+      def parse_error(body)
+        parse_json_error(body) || parse_plain_text_error(body)
+      end
+
+      def parse_json_error(body)
+        json = JSON.parse body rescue false
+
+        case json
+        when Array
+          json.first.join ' ' # message like [["name", "is already taken"]]
+        when Hash
+          json['error'] # message like {"error": "The error message"}
+        end
+      end
+
+      def parse_plain_text_error(body)
+        body
+      end
+
+    end
+  end
+end

data/lib/heroku-client/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Client
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/heroku-client/api_spec.rb

@@ -14,6 +14,14 @@ describe Heroku::Client::Api do
     FakeWeb.register_uri :get, Responses::Api.processes_url(api.apikey, app_name), body: Responses::Api.processes
     FakeWeb.register_uri :get, Responses::Api.releases_url(api.apikey, app_name), body: Responses::Api.releases
     FakeWeb.register_uri :get, Responses::Api.stacks_url(api.apikey, app_name), body: Responses::Api.stacks
+
+    FakeWeb.register_uri :post, Responses::Api.apps_url(api.apikey), body: Responses::Api.create_app
+    #FakeWeb.register_uri :post, Responses::Api.apps_url(api.apikey), request_body: "app[name]=test_app&app[stack]=bamboo", body: Responses::Api.create_app("test_app", "bamboo")
+
+    FakeWeb.register_uri :put, Responses::Api.rename_app_url(api.apikey), body: Responses::Api.rename_app
+    FakeWeb.register_uri :put, Responses::Api.transfer_app_url(api.apikey), body: Responses::Api.transfer_app
+
+    FakeWeb.register_uri :delete, Responses::Api.apps_by_name_url(api.apikey), body: "{}"
   end
 
   let(:api) { Heroku::Client::Api.new "apikey" }
@@ -36,6 +44,42 @@ describe Heroku::Client::Api do
     end
   end
 
+  describe "#create_app" do
+    it "returns created app" do
+      api.create_app.stack.should eq("cedar")
+    end
+
+=begin
+    context "when parameters are passed" do
+      let(:created_app) { api.create_app name: "test_app", stack: "bamboo" }
+
+      it "returns created app with given name" do
+        created_app.name.should eq("test_app")
+      end
+
+      it "returns create app with given stack"
+    end
+=end
+  end
+
+  describe "#rename_app" do
+    it "returns the new name for app" do
+      api.rename_app("example_old", "example_new").name.should eq("example_new")
+    end
+  end
+
+  describe "#transfer_app" do
+    it "is success" do
+      api.transfer_app "example", "new_owner@email.com"
+    end
+  end
+
+  describe "#delete_app" do
+    it "is success" do
+      api.delete_app "example"
+    end
+  end
+
   describe "#collaborators" do
     let(:collaborators) { api.collaborators(app_name) }
 

data/spec/heroku-client/http_spec.rb

@@ -14,35 +14,37 @@ describe Heroku::Client::Http do
     Http.new
   end
 
-  describe ".get" do
+  describe "#request" do
     context "success" do
       before do
         FakeWeb.register_uri :get, Responses::Api.apps_url(http.apikey), body: Responses::Api.apps
         FakeWeb.register_uri :get, Responses::Api.apps_by_name_url(http.apikey), body: Responses::Api.apps_by_name
       end
 
+      let(:result) { http.request(:get, "apps") }
+
       it "parses the response body" do
-        http.get("apps").should be_a(Array)
+        result.should be_a(Array)
       end
 
       it "parses the json hash to HerokuObj" do
-        http.get("apps").first.should be_a(Heroku::Client::HerokuObj)
+        result.first.should be_a(Heroku::Client::HerokuObj)
       end
 
       it "parses the json hash to HerokuObj" do
-        http.get("apps/example").should be_a(Heroku::Client::HerokuObj)
+        http.request(:get, "apps/example").should be_a(Heroku::Client::HerokuObj)
       end
     end
 
     shared_examples "http request error" do |http_code, http_msg, error_class|
       before do
-        FakeWeb.register_uri :get, "https://:apikey@api.heroku.com/apps", status: [http_code, http_msg]
+        FakeWeb.register_uri :get, "https://:apikey@api.heroku.com/apps", status: [http_code, http_msg], body: '{ "error": "The error message" }'
       end
 
       it "raises #{error_class}" do
         expect {
-          http.get("apps")
-        }.to raise_error(error_class)
+          http.request(:get, "apps")
+        }.to raise_error(error_class, 'The error message')
       end
     end
 
@@ -75,7 +77,15 @@ describe Heroku::Client::Http do
     end
 
     context "unknown error" do
-      it_behaves_like "http request error", "500", "Unknown Error", Heroku::Client::UnknownError
+      before do
+        FakeWeb.register_uri :get, "https://:apikey@api.heroku.com/apps", status: ["500", "Internal Server Error"], body: '{ "error": "The error message" }'
+      end
+
+      it "raises UnkownError" do
+        expect {
+          http.request :get, "apps"
+        }.to raise_error(Heroku::Client::UnknownError)
+      end
     end
   end
 end

data/spec/heroku-client/json_util_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+describe Heroku::Client::JSONUtil do
+
+  describe "#parse_error" do
+    let(:json) { Heroku::Client::JSONUtil.new }
+
+    shared_examples "error parser" do |body, expected|
+      it "should parse error" do
+        json.parse_error(body).should eq(expected)
+      end
+    end
+
+    context "when error is json" do
+      context "and error is object" do
+        it_behaves_like "error parser", '{ "error": "The error message" }', "The error message"
+      end
+
+      context "and error is array" do
+        it_behaves_like "error parser", '[["name","is already taken"]]', 'name is already taken'
+      end
+    end
+
+    context "when error is plain text" do
+      it_behaves_like "error parser", 'Some plain text error message', 'Some plain text error message'
+    end
+  end
+
+end

data/spec/responses/api.rb

@@ -24,6 +24,48 @@ module Responses
       EJSON
     end
 
+    def self.create_app(app_name = "example", stack = "cedar")
+      <<-EJSON
+{
+  "id": 1000000,
+  "name": "#{app_name}",
+  "create_status": "complete",
+  "created_at": "2011/01/01 00:00:00 -0700",
+  "stack": "#{stack}",
+  "requested_stack": null,
+  "repo_migrate_status": "complete",
+  "slug_size": 1000000,
+  "repo_size": 1000000,
+  "dynos": 1,
+  "workers": 0
+}
+      EJSON
+    end
+
+    def self.rename_app_url(apikey)
+      base_url apikey, "apps/example_old"
+    end
+
+    def self.rename_app
+      <<-EJSON
+{
+  "name": "example_new"
+}
+      EJSON
+    end
+
+    def self.transfer_app_url(apikey)
+      base_url apikey, "apps/example"
+    end
+
+    def self.transfer_app
+      <<-EJSON
+{
+  "name": "name"
+}
+      EJSON
+    end
+
     def self.apps_by_name_url(apikey)
       base_url(apikey, "apps/example")
     end

data/spec/spec_helper.rb

@@ -13,3 +13,8 @@ shared_examples "attribute" do |attr, expected|
   end
 end
 
+RSpec.configure do |config|
+  config.after :each do
+    FakeWeb.clean_registry
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -110,10 +110,12 @@ files:
 - lib/heroku-client/api.rb
 - lib/heroku-client/heroku_obj.rb
 - lib/heroku-client/http.rb
+- lib/heroku-client/json_util.rb
 - lib/heroku-client/version.rb
 - spec/heroku-client/api_spec.rb
 - spec/heroku-client/heroku_obj_spec.rb
 - spec/heroku-client/http_spec.rb
+- spec/heroku-client/json_util_spec.rb
 - spec/heroku-client_spec.rb
 - spec/responses/api.rb
 - spec/spec_helper.rb
@@ -145,6 +147,8 @@ test_files:
 - spec/heroku-client/api_spec.rb
 - spec/heroku-client/heroku_obj_spec.rb
 - spec/heroku-client/http_spec.rb
+- spec/heroku-client/json_util_spec.rb
 - spec/heroku-client_spec.rb
 - spec/responses/api.rb
 - spec/spec_helper.rb
+has_rdoc: