Corrected with rubocop cop 'Style/RedundantBegin'.
This commit is contained in:
parent
6a41d0ee18
commit
a87482c8dd
|
@ -186,11 +186,6 @@ Style/SymbolProc:
|
||||||
Description: 'Use symbols as procs instead of blocks when possible.'
|
Description: 'Use symbols as procs instead of blocks when possible.'
|
||||||
Enabled: false
|
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:
|
Style/SignalException:
|
||||||
Description: 'Checks for proper usage of fail and raise.'
|
Description: 'Checks for proper usage of fail and raise.'
|
||||||
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#fail-method'
|
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#fail-method'
|
||||||
|
|
|
@ -282,96 +282,86 @@ class ApplicationController < ActionController::Base
|
||||||
|
|
||||||
# model helper
|
# model helper
|
||||||
def model_create_render (object, params)
|
def model_create_render (object, params)
|
||||||
begin
|
|
||||||
|
|
||||||
# create object
|
# create object
|
||||||
generic_object = object.new( object.param_cleanup( params[object.to_app_model_url], true ) )
|
generic_object = object.new( object.param_cleanup( params[object.to_app_model_url], true ) )
|
||||||
|
|
||||||
# save object
|
# save object
|
||||||
generic_object.save!
|
generic_object.save!
|
||||||
|
|
||||||
# set relations
|
# set relations
|
||||||
generic_object.param_set_associations( params )
|
generic_object.param_set_associations( params )
|
||||||
|
|
||||||
model_create_render_item(generic_object)
|
model_create_render_item(generic_object)
|
||||||
rescue Exception => e
|
rescue Exception => e
|
||||||
logger.error e.message
|
logger.error e.message
|
||||||
logger.error e.backtrace.inspect
|
logger.error e.backtrace.inspect
|
||||||
render json: { error: e.message }, status: :unprocessable_entity
|
render json: { error: e.message }, status: :unprocessable_entity
|
||||||
end
|
|
||||||
end
|
end
|
||||||
def model_create_render_item (generic_object)
|
def model_create_render_item (generic_object)
|
||||||
render json: generic_object.attributes_with_associations, status: :created
|
render json: generic_object.attributes_with_associations, status: :created
|
||||||
end
|
end
|
||||||
|
|
||||||
def model_update_render (object, params)
|
def model_update_render (object, params)
|
||||||
begin
|
|
||||||
|
|
||||||
# find object
|
# find object
|
||||||
generic_object = object.find( params[:id] )
|
generic_object = object.find( params[:id] )
|
||||||
|
|
||||||
# save object
|
# save object
|
||||||
generic_object.update_attributes!( object.param_cleanup( params[object.to_app_model_url] ) )
|
generic_object.update_attributes!( object.param_cleanup( params[object.to_app_model_url] ) )
|
||||||
|
|
||||||
# set relations
|
# set relations
|
||||||
generic_object.param_set_associations( params )
|
generic_object.param_set_associations( params )
|
||||||
|
|
||||||
model_update_render_item( generic_object )
|
model_update_render_item( generic_object )
|
||||||
rescue Exception => e
|
rescue Exception => e
|
||||||
logger.error e.message
|
logger.error e.message
|
||||||
logger.error e.backtrace.inspect
|
logger.error e.backtrace.inspect
|
||||||
render json: { error: e.message }, status: :unprocessable_entity
|
render json: { error: e.message }, status: :unprocessable_entity
|
||||||
end
|
|
||||||
end
|
end
|
||||||
def model_update_render_item (generic_object)
|
def model_update_render_item (generic_object)
|
||||||
render json: generic_object.attributes_with_associations, status: :ok
|
render json: generic_object.attributes_with_associations, status: :ok
|
||||||
end
|
end
|
||||||
|
|
||||||
def model_destory_render (object, params)
|
def model_destory_render (object, params)
|
||||||
begin
|
generic_object = object.find( params[:id] )
|
||||||
generic_object = object.find( params[:id] )
|
generic_object.destroy
|
||||||
generic_object.destroy
|
model_destory_render_item()
|
||||||
model_destory_render_item()
|
rescue Exception => e
|
||||||
rescue Exception => e
|
logger.error e.message
|
||||||
logger.error e.message
|
logger.error e.backtrace.inspect
|
||||||
logger.error e.backtrace.inspect
|
render json: { error: e.message }, status: :unprocessable_entity
|
||||||
render json: { error: e.message }, status: :unprocessable_entity
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
def model_destory_render_item ()
|
def model_destory_render_item ()
|
||||||
render json: {}, status: :ok
|
render json: {}, status: :ok
|
||||||
end
|
end
|
||||||
|
|
||||||
def model_show_render (object, params)
|
def model_show_render (object, params)
|
||||||
begin
|
|
||||||
|
|
||||||
if params[:full]
|
if params[:full]
|
||||||
generic_object_full = object.full( params[:id] )
|
generic_object_full = object.full( params[:id] )
|
||||||
render json: generic_object_full, status: :ok
|
render json: generic_object_full, status: :ok
|
||||||
return
|
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
|
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
|
end
|
||||||
def model_show_render_item (generic_object)
|
def model_show_render_item (generic_object)
|
||||||
render json: generic_object.attributes_with_associations, status: :ok
|
render json: generic_object.attributes_with_associations, status: :ok
|
||||||
end
|
end
|
||||||
|
|
||||||
def model_index_render (object, _params)
|
def model_index_render (object, _params)
|
||||||
begin
|
generic_objects = object.all
|
||||||
generic_objects = object.all
|
model_index_render_result( generic_objects )
|
||||||
model_index_render_result( generic_objects )
|
rescue Exception => e
|
||||||
rescue Exception => e
|
logger.error e.message
|
||||||
logger.error e.message
|
logger.error e.backtrace.inspect
|
||||||
logger.error e.backtrace.inspect
|
render json: { error: e.message }, status: :unprocessable_entity
|
||||||
render json: { error: e.message }, status: :unprocessable_entity
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
def model_index_render_result (generic_objects)
|
def model_index_render_result (generic_objects)
|
||||||
render json: generic_objects, status: :ok
|
render json: generic_objects, status: :ok
|
||||||
|
|
Loading…
Reference in a new issue