templus_models 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be235e07c0065d4c5a85c2f1aaec34e7e99c4474
-  data.tar.gz: 28d9d080353e73cdc00c3f12750c6c64e4edc90f
+  metadata.gz: eae503daae66ce05e76fdfe3ecd11acaed24bb16
+  data.tar.gz: 2f4483b49c3e176d5625cbf356f16779f160b691
 SHA512:
-  metadata.gz: b5f3146b2773659878fb772d6138791840f45114fba3b9fb3007ada4edb1e6d87ca766ec73ccec0f5f109b783b62ad3824179738e56ed0b055f1ce98752af871
-  data.tar.gz: b46be38880c155a8853ff77e6d11d9f1dee39544bc4bddf394934987ffed35f0a8050c20fc91025698080870d87f02c821e7677b040fe245e6d937048bc45199
+  metadata.gz: 6ef51d8bb46956f4bebb9e6c3dc40ea9d700c4727f09afe01e7da7608a77daa9c760c61458a1e10e036790ae6b3b5321bc9a7fdd40972706403d98f5bfd271af
+  data.tar.gz: d84354d547bc57ab597b573257226ac639883ebe68ebea13f04374889fdc8d7d96e8ad353e57a92b7b86c1bccdba61b4219313c289fd68df3366944fa3f598a3

data/app/controllers/crud_controller.rb

@@ -1,31 +1,9 @@
 class CrudController < ApplicationController
   before_filter :setup, except: :autocomplete
 
-  private
-  def setup
-    if params[:associacao]
-      @crud_associacao = Module.const_get("#{params[:model].to_s.singularize}_crud".camelize)
-      @model = Module.const_get(params[:model].camelize).find(params[:id]).send(params[:associacao])
-      c_helper = Module.const_get(params[:model].camelize).reflect_on_association(params[:associacao]).class_name
-      @crud_helper = Module.const_get("#{c_helper}Crud") unless params[:render] == "modal" and params[:action] == "new"
-      @url = crud_associacao_models_path(model: params[:model], id: params[:id], associacao: params[:associacao], page: params[:page], q: params[:q])
-      @clean_url = crud_associacao_models_path(model: params[:model], id: params[:id], associacao: params[:associacao])
-      @model_permission = c_helper.constantize
-      @id = params[:associacao_id] if params[:associacao_id]
-    else
-      @model = Module.const_get(params[:model].camelize)
-      @model_permission = @model
-      @crud_helper = Module.const_get("#{params[:model]}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
-      @url = crud_models_path(model: params[:model], page: params[:page], q: params[:q])
-      @clean_url = crud_models_path(model: params[:model])
-      @id = params[:id] if params[:id]
-    end
-  end
-
-  public
   def index
     authorize! :read, @model_permission if respond_to?(:current_usuario)
-    if params[:scope].present?
+    if params[:scope].present? && valid_method?(params[:scope])
       @q = @model.send(params[:scope]).search(params[:q])
     else
       @q = @model.search(params[:q])
@@ -75,7 +53,7 @@ class CrudController < ApplicationController
   def action
     @record = @model.find(@id)
     authorize! :create_or_update, @record if respond_to?(:current_usuario)
-    if @model.method_defined?(params[:acao])
+    if valid_instance_method?(params[:acao])
       if @record.send(params[:acao])
         flash.now[:success] = "Ação #{params[:acao]} efetuada com sucesso."
       else
@@ -166,7 +144,11 @@ class CrudController < ApplicationController
     else
       results = @q.result.page(params[:page])
     end
-    method_label = params[:label]
+    if valid_instance_method?(params[:label])
+      method_label = params[:label]
+    else
+      raise "Ação inválida"
+    end
     render json: results.map {|result| {id: result.id, label: result.send(method_label), value: result.send(method_label)} }
   end
 
@@ -196,6 +178,30 @@ class CrudController < ApplicationController
   end
 
   private
+  def setup
+    if params[:associacao]
+      @crud_associacao = Module.const_get("#{params[:model].to_s.singularize}_crud".camelize)
+      if Module.const_get(params[:model].camelize).reflect_on_association(params[:associacao])
+        @model = Module.const_get(params[:model].camelize).find(params[:id]).send(params[:associacao])
+      else
+        raise "Ação inválida"
+      end
+      c_helper = Module.const_get(params[:model].camelize).reflect_on_association(params[:associacao]).class_name
+      @crud_helper = Module.const_get("#{c_helper}Crud") unless params[:render] == "modal" and params[:action] == "new"
+      @url = crud_associacao_models_path(model: params[:model], id: params[:id], associacao: params[:associacao], page: params[:page], q: params[:q])
+      @clean_url = crud_associacao_models_path(model: params[:model], id: params[:id], associacao: params[:associacao])
+      @model_permission = c_helper.constantize
+      @id = params[:associacao_id] if params[:associacao_id]
+    else
+      @model = Module.const_get(params[:model].camelize)
+      @model_permission = @model
+      @crud_helper = Module.const_get("#{params[:model]}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
+      @url = crud_models_path(model: params[:model], page: params[:page], q: params[:q])
+      @clean_url = crud_models_path(model: params[:model])
+      @id = params[:id] if params[:id]
+    end
+  end
+
   def params_permitt
     params.require(@model.name.underscore.to_sym).permit(fields_model)
   end
@@ -251,4 +257,22 @@ class CrudController < ApplicationController
     end
     group
   end
+  
+  def valid_method?(method)
+    list_methods = []
+    @model.ancestors.each do |m|
+      list_methods << m.methods(false).reject{ |m| /^_/ =~ m.to_s }
+      break if m.superclass.to_s == "ActiveRecord::Base"
+    end
+    list_methods.flatten.include? method.to_sym
+  end
+  
+  def valid_instance_method?(method)
+    list_methods = []
+    @model.ancestors.each do |m|
+      list_methods << m.instance_methods(false).reject{ |m| /^_/ =~ m.to_s }
+      break if m.superclass.to_s == "ActiveRecord::Base"
+    end
+    list_methods.flatten.include? method.to_sym
+  end
 end

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.6.5"
+  VERSION = "1.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -977,7 +977,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easy CRUD generator for Rails Projects