Fix rubocob warnings.

Author: Hyperkid123

app/controllers/api/pxe_servers_controller.rb

@@ -1,6 +1,6 @@
 module Api
   class PxeServersController < BaseController
-    INVALID_PXE_SERVER_ATTRS = %w(id href).freeze # Cannot update or create these
+    INVALID_PXE_SERVER_ATTRS = %w[id href].freeze # Cannot update or create these
 
     include Subcollections::PxeImages
     include Subcollections::PxeMenus
@@ -13,33 +13,33 @@ def create_resource(_type, _id, data = {})
       if server.invalid?
         raise BadRequestError, "Failed to add a pxe server - #{server.errors.full_messages.join(', ')}"
       end
+
       server.pxe_menus = create_pxe_menus(menus) if menus
       server
     end
 
     def delete_resource(_type, id = nil, data = nil)
       raise BadRequestError, "Must specify an id for deleting a pxe server" unless id
+
       super
     end
 
-
     def edit_resource(type, id, data)
       server = resource_search(id, type, collection_class(:pxe_servers))
-      
-
       menus = data.delete('pxe_menus')
       if menus
         server.pxe_menus.clear
-        data.merge!('pxe_menus' => create_pxe_menus(menus))
+        data['pxe_menus'] = create_pxe_menus(menus)
       end
-      server.update_attributes!(data)
+
+      server.update!(data)
       server
     end
 
     private
 
     def create_pxe_menus(menus)
-      menus.map do | menu |
+      menus.map do |menu|
         collection_class(:pxe_menus).create(menu)
       end
     end
@@ -51,7 +51,7 @@ def validate_pxe_server_data(data)
 
     def validate_pxe_server_create_data(data)
       validate_pxe_server_data(data)
-      req_attrs = %w(name uri)
+      req_attrs = %w[name uri]
       bad_attrs = []
       req_attrs.each { |attr| bad_attrs << attr if data[attr].blank? }
       raise BadRequestError, "Missing attribute(s) #{bad_attrs.join(', ')} for creating a pxe server" if bad_attrs.present?

config/api.yml

@@ -2356,31 +2356,6 @@
         :identifier: miq_request_control
       - :name: edit
         :identifier: miq_request_edit
-  :pxe_menus:
-    :description: PXE Menus
-    :identifier: pxe_server_accord
-    :options:
-      - :collection
-    :verbs: *gpppd
-    :klass: PxeMenu
-    :collection_actions:
-      :get:
-      - :name: read
-        :identifier: pxe_server_view
-      :post:
-      - :name: create
-        :identifier: pxe_server_create
-    :subresource_actions:
-      :get:
-      - :name: read
-        :identifier: pxe_server_view
-    :subcollection_actions:
-      :get:
-      - :name: read
-        :identifier: pxe_server_view
-      :post:
-      - :name: create
-        :identifier: pxe_server_create
   :pxe_images:
     :description: PXE Images
     :identifier: pxe_server_accord
@@ -2406,6 +2381,31 @@
       :get:
       - :name: read
         :identifier: pxe_server_view
+  :pxe_menus:
+    :description: PXE Menus
+    :identifier: pxe_server_accord
+    :options:
+    - :collection
+    :verbs: *gpppd
+    :klass: PxeMenu
+    :collection_actions:
+      :get:
+      - :name: read
+        :identifier: pxe_server_view
+      :post:
+      - :name: create
+        :identifier: pxe_server_create
+    :subresource_actions:
+      :get:
+      - :name: read
+        :identifier: pxe_server_view
+    :subcollection_actions:
+      :get:
+      - :name: read
+        :identifier: pxe_server_view
+      :post:
+      - :name: create
+        :identifier: pxe_server_create
   :pxe_servers:
     :description: PXE Servers
     :identifier: pxe_server_accord

spec/requests/pxe_servers_spec.rb

@@ -125,7 +125,7 @@
         "href"          => api_pxe_server_pxe_menu_url(nil, pxe_server, pxe_menu_1),
         "id"            => pxe_menu_1.id.to_s,
         "pxe_server_id" => pxe_server.id.to_s,
-        "file_name"          => pxe_menu_1.file_name
+        "file_name"     => pxe_menu_1.file_name
       )
       expect(response).to have_http_status(:ok)
     end
@@ -142,22 +142,15 @@
 
     it 'create new pxe server' do
       api_basic_authorize collection_action_identifier(:pxe_servers, :create, :post)
-      post(url, :params => {
-        :name => 'foo',
-        :uri  => 'bar/quax'
-      })
+      post(url, :params => {:name => 'foo', :uri => 'bar/quax'})
       expect(response).to have_http_status(:ok)
       expect(response.parsed_body['results'].first['name']).to eq('foo')
       expect(response.parsed_body['results'].first['uri']).to eq('bar/quax')
     end
 
     it 'create new pxe server with pxe menu' do
       api_basic_authorize collection_action_identifier(:pxe_servers, :create, :post)
-      post(url, :params => {
-        :name       => 'foo',
-        :uri        => 'bar/quax',
-        :pxe_menus  => [{:file_name => 'menu_1'}]
-      })
+      post(url, :params => {:name => 'foo', :uri => 'bar/quax', :pxe_menus => [{:file_name => 'menu_1'}]})
       expect(response).to have_http_status(:ok)
       expect(PxeServer.find(response.parsed_body['results'].first['id']).pxe_menus.first[:file_name]).to eq('menu_1')
     end
@@ -168,11 +161,7 @@
 
     it 'update pxe server' do
       api_basic_authorize collection_action_identifier(:pxe_servers, :edit, :patch)
-      patch(url, :params => {
-        :name       => 'updated name',
-        :uri        => 'updated/url',
-        :pxe_menus  => [{ file_name: 'updated menu' }]
-      })
+      patch(url, :params => {:name => 'updated name', :uri => 'updated/url', :pxe_menus => [{:file_name => 'updated menu'}]})
       expect(response).to have_http_status(:ok)
       expect(response.parsed_body['name']).to eq('updated name')
       expect(response.parsed_body['uri']).to eq('updated/url')