thecore_api 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77b761b925780fcc6028197f2bbb1cd181b0a4f65e59e59d7c3e44c49d075038
-  data.tar.gz: 88559518468dcffe114a79d6a323a1f5b7ab0964d7036fbf09c14a6a37b719f1
+  metadata.gz: 425d080e2569d8b3c6a5890b26f03e5c50fdbf08fd387719b114af3d8d72ead4
+  data.tar.gz: 0def430ef68a0bae6f63fd3f8ed434b5111ae62bd246f79f38d44b5a0fce5576
 SHA512:
-  metadata.gz: 36d00b25f1abc7c32e27008bb868b8e6da53af67c7539574650ea38a9ac3b41cf91cb924685c7543861130048437303e5c2ade9539d3e9476a65911c82ff8822
-  data.tar.gz: 134a1e19be4ae5e2a5420e04b55b2638c7ff79c58507429bc6ae4c3501be208ab879249f8b3e22edc798c95a847f61982c60468e8b065738f4d6f503efcb6d0c
+  metadata.gz: ff82f98af88ed60a78e1c4996636a8074f0d95462d77dfad0c856f3c4cacb399324ee43c2007b35a9345fe9db5e6bd7475e568ea1045d4239661762e2314cb24
+  data.tar.gz: 209de01dbae0e5683609c75c19364f3f4149f370f98be9eeb21bf926de0772e909f194cd5e7f556f07088b9cf7989e581808a327266e5674762216ff978adcd3

data/app/controllers/api/v1/base_controller.rb

@@ -22,7 +22,7 @@ class Api::V1::BaseController < ActionController::API
   before_action :destroy_session
 
   before_action :authenticate_user!
-  before_action :find_model, except: [ :version, :available_roles, :translations, :schema ]
+  before_action :find_model#, except: [ :version, :available_roles, :translations, :schema ]
   before_action :find_record, only: [ :show, :update, :destroy ]
 
   rescue_from ActiveRecord::StatementInvalid, with: :unauthenticated!
@@ -152,7 +152,7 @@ class Api::V1::BaseController < ActionController::API
 
   def show
     result = @record.to_json(json_attrs)
-    render json: result, status: result.blank? ? 404 : 200
+    render json: result, status: 200
   end
 
   def create
@@ -171,11 +171,9 @@ class Api::V1::BaseController < ActionController::API
   end
 
   def destroy
-    unless @record.destroy
-       return api_error(status: 500)
-    end
-
-    render json: {message: "Deleted"}, status: 200
+    return api_error(status: 500) unless @record.destroy
+    # render json: {message: "Deleted"}, status: 200
+    head :ok
   end
 
   protected
@@ -208,7 +206,7 @@ class Api::V1::BaseController < ActionController::API
 
   def api_error(status: 500, errors: [])
     # puts errors.full_messages if !Rails.env.production? && errors.respond_to?(:full_messages)
-    head status: status && return if errors.empty?
+    head status && return if errors.empty?
     
     # For retrocompatibility, I try to send back only strings, as errors
     errors_response = if errors.respond_to?(:full_messages) 
@@ -265,18 +263,17 @@ class Api::V1::BaseController < ActionController::API
   def find_record
     # find the records
     @record = @model.column_names.include?("user_id") ? @model.where(id: (@record_id.presence || params[:id]), user_id: current_user.id).first : @model.find((@record_id.presence || params[:id]))
+    return not_found! if @record.blank?
   end
 
   def find_model path=nil
     # Find the name of the model from controller
-    path ||= params[:path]
-    @singular_controller = (path.presence || controller_name).singularize.to_sym
-    @model = (path.presence || controller_path).classify.constantize rescue controller_name.classify.constantize
+    path ||= params[:path].split("/").first
+    @model = (path.presence || controller_path).classify.constantize rescue controller_name.classify.constantize rescue nil
   end
 
   def request_params
-    # controller_name.singularize.to_sym 
-    (@params.presence || params).require(@singular_controller).permit!
+    (@params.presence || params).require(params[:path].split("/").first.singularize.to_sym).permit!
   end
 
   def json_attrs

data/lib/thecore_api/version.rb

@@ -1,3 +1,3 @@
 module ThecoreApi
-  VERSION = "1.4.4".freeze
+  VERSION = "1.4.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thecore_api
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Gabriele Tassoni