From 915dac0055cd801c080ebcd37749f4fc6d2d12c4 Mon Sep 17 00:00:00 2001
From: Alex Denisov <1101.debian@gmail.com>
Date: Mon, 10 Sep 2012 10:41:46 +0300
Subject: Error throwing moved to api_helper

---
 lib/api/helpers.rb | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'lib/api/helpers.rb')

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index c0ba874790a..3a385f1582a 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -8,7 +8,7 @@ module Gitlab
       if @project ||= current_user.projects.find_by_id(params[:id]) ||
                       current_user.projects.find_by_code(params[:id])
       else
-        error!({'message' => '404 Not found'}, 404)
+        not_found!
       end
 
       @project
@@ -19,15 +19,36 @@ module Gitlab
     end
 
     def authenticate!
-      error!({'message' => '401 Unauthorized'}, 401) unless current_user
+      unauthorized! unless current_user
     end
 
     def authorize! action, subject
       unless abilities.allowed?(current_user, action, subject)
-        error!({'message' => '403 Forbidden'}, 403)
+        forbidden!
       end
     end
 
+    # error helpers
+
+    def forbidden!
+      error!({'message' => '403 Forbidden'}, 403)
+    end
+
+    def not_found!(resource = nil)
+      message = ["404"]
+      message << resource if resource
+      message << "Not Found"
+      error!({'message' => message.join(' ')}, 404)
+    end
+
+    def unauthorized!
+      error!({'message' => '401 Unauthorized'}, 401)
+    end
+
+    def not_allowed!
+        error!({'message' => 'method not allowed'}, 405)
+    end
+
     private 
 
     def abilities
-- 
cgit v1.2.1


From a065557208d6076ec869144346e06c7de714389c Mon Sep 17 00:00:00 2001
From: Alex Denisov <1101.debian@gmail.com>
Date: Mon, 10 Sep 2012 13:49:00 +0300
Subject: Common errors method added

---
 lib/api/helpers.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib/api/helpers.rb')

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 3a385f1582a..054eb2d3f70 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -31,22 +31,26 @@ module Gitlab
     # error helpers
 
     def forbidden!
-      error!({'message' => '403 Forbidden'}, 403)
+      render_api_error!('403 Forbidden', 403)
     end
 
     def not_found!(resource = nil)
       message = ["404"]
       message << resource if resource
       message << "Not Found"
-      error!({'message' => message.join(' ')}, 404)
+      render_api_error!(message.join(' '), 404)
     end
 
     def unauthorized!
-      error!({'message' => '401 Unauthorized'}, 401)
+      render_api_error!('401 Unauthorized', 401)
     end
 
     def not_allowed!
-        error!({'message' => 'method not allowed'}, 405)
+      render_api_error!('Method Not Allowed', 405)
+    end
+
+    def render_api_error!(message, status)
+      error!({'message' => message}, status)
     end
 
     private 
-- 
cgit v1.2.1


From 549c4c2202307608773a10d8ce9a7dc978537de4 Mon Sep 17 00:00:00 2001
From: Alex Denisov <1101.debian@gmail.com>
Date: Sun, 16 Sep 2012 19:51:04 +0300
Subject: API attributes refactored

---
 lib/api/helpers.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib/api/helpers.rb')

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 054eb2d3f70..d0fc8c434a2 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -28,6 +28,14 @@ module Gitlab
       end
     end
 
+    def existed_attributes(keys)
+      attrs = {}
+      keys.each do |key|
+        attrs[key] = params[key] if params[key].present?
+      end
+      attrs
+    end
+
     # error helpers
 
     def forbidden!
-- 
cgit v1.2.1


From b896880eb46c2b8167e2252d3656b5e38e35f6ec Mon Sep 17 00:00:00 2001
From: Alex Denisov <1101.debian@gmail.com>
Date: Sun, 16 Sep 2012 20:08:57 +0300
Subject: Method name changed

---
 lib/api/helpers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/api/helpers.rb')

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index d0fc8c434a2..9a08b995800 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -28,7 +28,7 @@ module Gitlab
       end
     end
 
-    def existed_attributes(keys)
+    def attributes_for_keys(keys)
       attrs = {}
       keys.each do |key|
         attrs[key] = params[key] if params[key].present?
-- 
cgit v1.2.1