thecore_api 1.2.9 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee696aacf1b0d3c09bfd32c87b50c0a80b23885aa8e9c2d502feb18c8143acfe
-  data.tar.gz: 334177918179c064d4e4befd95706689d4b956352259bb80088bbb9bca2c3e90
+  metadata.gz: 652a914141b6f13ca7a4c4bb38cd2d1f5d18ad2176f172d4d41c97b8957a6052
+  data.tar.gz: 4751c908c3b8ae4fdf0b241654e9e201a14d3041cb8e8082dc97f03b28ddfb6e
 SHA512:
-  metadata.gz: 04750ed5e942de5053e953c2019d5184bc5c04aeb0fcf9cb6759301c7456ad467fb4a93218d8d7fedcf5c88e468f389e71cf332c0f91d2f2da56b87305d1fff2
-  data.tar.gz: 19af2ccd66a3a0873ae2555d51704e042461e2397605079bec154733806f6862d620346c1c09758e3af6a6f9fad84740bfa89deebacdfb5aaec6adaac8e39d42
+  metadata.gz: a556839a53c08cd73e3fd041e276028df41f5cfcc322a8a1bec46873f091be6ed010ca4ef736adb0fbd627c0ed1a19b06039addc035af4c4b2a049ba5ba0bdaa
+  data.tar.gz: 1ca71d563bdb7e1676ce5f9e004a881e30554ad6c990223da23569297be3f09e1df1c75cb98e21435ea488ae47188a8ed6a4236722ccc2410e473cf2e40104a9

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

@@ -1,3 +1,11 @@
+# Rails.application.routes.disable_clear_and_finalize = true
+# Rails.application.routes.draw do
+#   namespace :api do
+#     namespace :v1, defaults: { format: :json } do
+
+#     end
+#   end
+# end
 # https://labs.kollegorna.se/blog/2015/04/build-an-api-now/
 class Api::V1::BaseController < ActionController::API
   include CanCan::ControllerAdditions
@@ -14,7 +22,7 @@ class Api::V1::BaseController < ActionController::API
   before_action :destroy_session
 
   before_action :authenticate_user!
-  before_action :find_model, except: [ :version, :token, :available_roles ]
+  before_action :find_model, except: [ :version, :token, :available_roles, :check ]
   before_action :find_record, only: [ :show, :update, :destroy ]
 
   rescue_from ActiveRecord::RecordNotFound, with: :not_found!
@@ -31,11 +39,54 @@ class Api::V1::BaseController < ActionController::API
   #   request.parameters
   # end
 
+  def check
+    path = params[:path].split("/")
+    find_model path.first
+    if request.get?
+      if path.second.blank?
+        @page = params[:page]
+        @per = params[:per]
+        @pages_info = params[:pages_info]
+        @count = params[:count]
+        @query = params[:q]
+        index
+      elsif path.second.to_i.zero?
+        # String, so it's a custom action I must find in the @model (as an singleton method)
+        # Like: :controller/:custom_action
+        return render json: MultiJson.dump(@model.send(path.second, params))
+      elsif !path.second.to_i.zero? && path.third.blank?
+        # Integer, so it's an ID, I must show it
+        find_record path.second.to_i
+        show
+      elsif !path.second.to_i.zero? && !path.third.blank?
+        # Like :controller/:id/:custom_action
+        return render json: MultiJson.dump(@model.send(path.third, path.second.to_i, params))
+      end
+    elsif request.post?
+      # Non sono certo che i request params gli arrivino... Domani da testare
+      # Il body come glielo passo?
+      create
+    elsif request.put?
+      # Non sono certo che i request params gli arrivino... Domani da testare
+      # Il body come glielo passo?
+      find_record path.second.to_i
+      update
+    elsif request.delete?
+      find_record path.second.to_i
+      destroy
+    end
+  end
+
   def index
+    # Rails.logger.debug params.inspect
     # find the records
-    @q = (@model.column_names.include?("user_id") ? @model.where(user_id: current_user.id) : @model).ransack(params[:q])
+    @q = (@model.column_names.include?("user_id") ? @model.where(user_id: current_user.id) : @model).ransack(@query.presence|| params[:q])
     @records_all = @q.result(distinct: true)
-    @records = @records_all.page(params[:page]).per(params[:per])
+    page = (@page.presence || params[:page])
+    per = (@per.presence || params[:per])
+    pages_info = (@pages_info.presence || params[:pages_info])
+    count = (@count.presence || params[:count])
+    @records = @records_all.page(page).per(per)
 
     # If there's the keyword pagination_info, then return a pagination info object
     return render json: MultiJson.dump({
@@ -48,13 +99,13 @@ class Api::V1::BaseController < ActionController::API
       is_out_of_range: @records.out_of_range?,
       pages_count: @records.total_pages,
       current_page_number: @records.current_page
-    }) if !params[:pages_info].nil?
+    }) if !pages_info.blank?
     # If it's asked for page number, the paginate
-    return render json: MultiJson.dump(@records, @json_attrs || {}) if !params[:page].nil? # (@json_attrs || {})
+    return render json: MultiJson.dump(@records, json_attrs) if !page.blank? # (@json_attrs || {})
     # if you ask for count, then return a json object with just the number of objects
-    return render json: MultiJson.dump({count: @records_all.count}) if !params[:count].nil?
+    return render json: MultiJson.dump({count: @records_all.count}) if !count.blank?
     # Default
-    render json: MultiJson.dump(@records_all, @json_attrs || {}) #(@json_attrs || {})
+    render json: MultiJson.dump(@records_all, json_attrs) #(@json_attrs || {})
   end
 
   # def count
@@ -71,7 +122,7 @@ class Api::V1::BaseController < ActionController::API
   end
 
   def show
-    render json: @record.to_json(@json_attrs || {}), status: 200
+    render json: @record.to_json(json_attrs), status: 200
   end
 
   def create
@@ -80,13 +131,13 @@ class Api::V1::BaseController < ActionController::API
 
     @record.save!
 
-    render json: @record.to_json(@json_attrs || {}), status: 201
+    render json: @record.to_json(json_attrs), status: 201
   end
 
   def update
     @record.update_attributes(request_params)
 
-    render json: @record.to_json(@json_attrs || {}), status: 200
+    render json: @record.to_json(json_attrs), status: 200
   end
 
   def destroy
@@ -181,17 +232,23 @@ class Api::V1::BaseController < ActionController::API
 
   # private
 
-  def find_record
+  def find_record id
     # find the records
-    @record = @model.column_names.include?("user_id") ? @model.where(id: params[:id], user_id: current_user.id).first : @model.find(params[:id])
+    @record = @model.column_names.include?("user_id") ? @model.where(id: (id.presence || params[:id]), user_id: current_user.id).first : @model.find((id.presence || params[:id]))
   end
 
-  def find_model
+  def find_model path=nil
     # Find the name of the model from controller
-    @model = controller_path.classify.constantize rescue controller_name.classify.constantize
+    @singular_controller = (path.presence || controller_name).singularize.to_sym
+    @model = (path.presence || controller_path).classify.constantize rescue controller_name.classify.constantize
   end
 
   def request_params
-    params.require(controller_name.singularize.to_sym).permit!
+    # controller_name.singularize.to_sym 
+    params.require(@singular_controller).permit!
+  end
+
+  def json_attrs
+    @model.json_attrs.presence || @json_attrs.presence || {}
   end
 end

data/config/initializers/after_initialize_for_thecore_api.rb

@@ -0,0 +1,7 @@
+
+Rails.application.configure do
+  config.after_initialize do
+
+#    Rails.application.reload_routes!
+  end
+end

data/config/routes.rb

@@ -17,6 +17,19 @@ Rails.application.routes.draw do
       resources :users, only: [:index, :create, :show, :update, :destroy] do
         match 'search' => 'users#search', via: [:get, :post], as: :search, on: :collection
       end
+
+      namespace :base do
+        get :check
+        post :check
+        put :check
+        delete :check
+      end
+
+      # Catchall routes
+      get '*path', to: 'base#check'
+      post '*path', to: 'base#check'
+      put '*path', to: 'base#check'
+      delete '*path', to: 'base#check'
     end
   end
 end

data/lib/thecore_api/version.rb

@@ -1,3 +1,3 @@
 module ThecoreApi
-  VERSION = "1.2.9".freeze
+  VERSION = "1.3.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_api
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.3
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore
@@ -93,6 +93,7 @@ files:
 - app/controllers/api/v1/info_controller.rb
 - app/controllers/api/v1/sessions_controller.rb
 - app/controllers/api/v1/users_controller.rb
+- config/initializers/after_initialize_for_thecore_api.rb
 - config/initializers/cors_api_thecore.rb
 - config/initializers/wrap_parameters.rb
 - config/routes.rb