Corrected with rubocop cop 'Style/RedundantBegin'.

This commit is contained in:
Thorsten Eckel 2015-05-07 12:20:52 +02:00
parent 6a41d0ee18
commit a87482c8dd
2 changed files with 46 additions and 61 deletions

View file

@ -186,11 +186,6 @@ Style/SymbolProc:
Description: 'Use symbols as procs instead of blocks when possible.'
Enabled: false
Style/RedundantBegin:
Description: "Don't use begin blocks when they are not needed."
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#begin-implicit'
Enabled: false
Style/SignalException:
Description: 'Checks for proper usage of fail and raise.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#fail-method'

View file

@ -282,96 +282,86 @@ class ApplicationController < ActionController::Base
# model helper
def model_create_render (object, params)
begin
# create object
generic_object = object.new( object.param_cleanup( params[object.to_app_model_url], true ) )
# create object
generic_object = object.new( object.param_cleanup( params[object.to_app_model_url], true ) )
# save object
generic_object.save!
# save object
generic_object.save!
# set relations
generic_object.param_set_associations( params )
# set relations
generic_object.param_set_associations( params )
model_create_render_item(generic_object)
rescue Exception => e
logger.error e.message
logger.error e.backtrace.inspect
render json: { error: e.message }, status: :unprocessable_entity
end
model_create_render_item(generic_object)
rescue Exception => e
logger.error e.message
logger.error e.backtrace.inspect
render json: { error: e.message }, status: :unprocessable_entity
end
def model_create_render_item (generic_object)
render json: generic_object.attributes_with_associations, status: :created
end
def model_update_render (object, params)
begin
# find object
generic_object = object.find( params[:id] )
# find object
generic_object = object.find( params[:id] )
# save object
generic_object.update_attributes!( object.param_cleanup( params[object.to_app_model_url] ) )
# save object
generic_object.update_attributes!( object.param_cleanup( params[object.to_app_model_url] ) )
# set relations
generic_object.param_set_associations( params )
# set relations
generic_object.param_set_associations( params )
model_update_render_item( generic_object )
rescue Exception => e
logger.error e.message
logger.error e.backtrace.inspect
render json: { error: e.message }, status: :unprocessable_entity
end
model_update_render_item( generic_object )
rescue Exception => e
logger.error e.message
logger.error e.backtrace.inspect
render json: { error: e.message }, status: :unprocessable_entity
end
def model_update_render_item (generic_object)
render json: generic_object.attributes_with_associations, status: :ok
end
def model_destory_render (object, params)
begin
generic_object = object.find( params[:id] )
generic_object.destroy
model_destory_render_item()
rescue Exception => e
logger.error e.message
logger.error e.backtrace.inspect
render json: { error: e.message }, status: :unprocessable_entity
end
generic_object = object.find( params[:id] )
generic_object.destroy
model_destory_render_item()
rescue Exception => e
logger.error e.message
logger.error e.backtrace.inspect
render json: { error: e.message }, status: :unprocessable_entity
end
def model_destory_render_item ()
render json: {}, status: :ok
end
def model_show_render (object, params)
begin
if params[:full]
generic_object_full = object.full( params[:id] )
render json: generic_object_full, status: :ok
return
end
generic_object = object.find( params[:id] )
model_show_render_item(generic_object)
rescue Exception => e
logger.error e.message
logger.error e.backtrace.inspect
render json: { error: e.message }, status: :unprocessable_entity
if params[:full]
generic_object_full = object.full( params[:id] )
render json: generic_object_full, status: :ok
return
end
generic_object = object.find( params[:id] )
model_show_render_item(generic_object)
rescue Exception => e
logger.error e.message
logger.error e.backtrace.inspect
render json: { error: e.message }, status: :unprocessable_entity
end
def model_show_render_item (generic_object)
render json: generic_object.attributes_with_associations, status: :ok
end
def model_index_render (object, _params)
begin
generic_objects = object.all
model_index_render_result( generic_objects )
rescue Exception => e
logger.error e.message
logger.error e.backtrace.inspect
render json: { error: e.message }, status: :unprocessable_entity
end
generic_objects = object.all
model_index_render_result( generic_objects )
rescue Exception => e
logger.error e.message
logger.error e.backtrace.inspect
render json: { error: e.message }, status: :unprocessable_entity
end
def model_index_render_result (generic_objects)
render json: generic_objects, status: :ok