Merge pull request #1480 from AlexDenisov/api_attrs_refactoring

API attributes refactoring

lib/api/helpers.rb

@@ -28,6 +28,14 @@ module Gitlab
       end
     end
 
+    def attributes_for_keys(keys)
+      attrs = {}
+      keys.each do |key|
+        attrs[key] = params[key] if params[key].present?
+      end
+      attrs
+    end
+
     # error helpers
 
     def forbidden!

lib/api/issues.rb

@@ -48,15 +48,10 @@ module Gitlab
       # Example Request:
       #   POST /projects/:id/issues
       post ":id/issues" do
-        @issue = user_project.issues.new(
+        attrs = attributes_for_keys [:title, :description, :assignee_id, :milestone_id]
-          title: params[:title],
+        attrs[:label_list] = params[:labels] if params[:labels].present?
-          description: params[:description],
+        @issue = user_project.issues.new attrs
-          assignee_id: params[:assignee_id],
-          milestone_id: params[:milestone_id],
-          label_list: params[:labels]
-        )
         @issue.author = current_user
-
         if @issue.save
           present @issue, with: Entities::Issue
         else
@@ -81,16 +76,9 @@ module Gitlab
         @issue = user_project.issues.find(params[:issue_id])
         authorize! :modify_issue, @issue
 
-        parameters = {
+        attrs = attributes_for_keys [:title, :description, :assignee_id, :milestone_id, :closed]
-          title: (params[:title] || @issue.title),
+        attrs[:label_list] = params[:labels] if params[:labels].present?
-          description: (params[:description] || @issue.description),
+        if @issue.update_attributes attrs
-          assignee_id: (params[:assignee_id] || @issue.assignee_id),
-          milestone_id: (params[:milestone_id] || @issue.milestone_id),
-          label_list: (params[:labels] || @issue.label_list),
-          closed: (params[:closed] || @issue.closed)
-        }
-
-        if @issue.update_attributes(parameters)
           present @issue, with: Entities::Issue
         else
           not_found!

lib/api/milestones.rb

@@ -36,12 +36,8 @@ module Gitlab
       # Example Request:
       #   POST /projects/:id/milestones
       post ":id/milestones" do
-        @milestone = user_project.milestones.new(
+        attrs = attributes_for_keys [:title, :description, :due_date]
-          title: params[:title],
+        @milestone = user_project.milestones.new attrs
-          description: params[:description],
-          due_date: params[:due_date]
-        )
-
         if @milestone.save
           present @milestone, with: Entities::Milestone
         else
@@ -64,14 +60,8 @@ module Gitlab
         authorize! :admin_milestone, user_project
 
         @milestone = user_project.milestones.find(params[:milestone_id])
-        parameters = {
+        attrs = attributes_for_keys [:title, :description, :due_date, :closed]
-          title: (params[:title] || @milestone.title),
+        if @milestone.update_attributes attrs
-          description: (params[:description] || @milestone.description),
-          due_date: (params[:due_date] || @milestone.due_date),
-          closed: (params[:closed] || @milestone.closed)
-        }
-
-        if @milestone.update_attributes(parameters)
           present @milestone, with: Entities::Milestone
         else
           not_found!

lib/api/projects.rb

@@ -40,13 +40,16 @@ module Gitlab
       post do
         params[:code] ||= params[:name]
         params[:path] ||= params[:name]
-        project_attrs = {}
+        attrs = attributes_for_keys [:code, 
-        params.each_pair do |k ,v|
+                                    :path, 
-          if Project.attribute_names.include? k
+                                    :name, 
-            project_attrs[k] = v
+                                    :description, 
-          end
+                                    :default_branch, 
-        end
+                                    :issues_enabled, 
-        @project = Project.create_by_user(project_attrs, current_user)
+                                    :wall_enabled, 
+                                    :merge_requests_enabled, 
+                                    :wiki_enabled]
+        @project = Project.create_by_user(attrs, current_user)
         if @project.saved?
           present @project, with: Entities::Project
         else
@@ -204,12 +207,10 @@ module Gitlab
       # Example Request:
       #   POST /projects/:id/snippets
       post ":id/snippets" do
-        @snippet = user_project.snippets.new(
+        attrs = attributes_for_keys [:title, :file_name]
-          title: params[:title],
+        attrs[:expires_at] = params[:lifetime] if params[:lifetime].present?
-          file_name: params[:file_name],
+        attrs[:content] = params[:code] if params[:code].present?
-          expires_at: params[:lifetime],
+        @snippet = user_project.snippets.new attrs
-          content: params[:code]
-        )
         @snippet.author = current_user
 
         if @snippet.save
@@ -234,14 +235,11 @@ module Gitlab
         @snippet = user_project.snippets.find(params[:snippet_id])
         authorize! :modify_snippet, @snippet
 
-        parameters = {
+        attrs = attributes_for_keys [:title, :file_name]
-          title: (params[:title] || @snippet.title),
+        attrs[:expires_at] = params[:lifetime] if params[:lifetime].present?
-          file_name: (params[:file_name] || @snippet.file_name),
+        attrs[:content] = params[:code] if params[:code].present?
-          expires_at: (params[:lifetime] || @snippet.expires_at),
-          content: (params[:code] || @snippet.content)
-        }
 
-        if @snippet.update_attributes(parameters)
+        if @snippet.update_attributes attrs
           present @snippet, with: Entities::ProjectSnippet
         else
           not_found!