templus_models 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 800c8874f35daeb9d38c42153253e4e60087568c
-  data.tar.gz: e29d7680ec274ac5571df3d90de31904e9b3b62d
+  metadata.gz: bf74bcbc672934c1f6c18c0d8622c681ebd06911
+  data.tar.gz: 63c43c5d92fcda0d029b9d1f354caf3e208878aa
 SHA512:
-  metadata.gz: c1020f4029559eceb571324d6584fd431a4f9e3c5b76f7d723f90a9f1d34c7ebf984a6335aaf7dee18e96051b57f52f8c8b91527c076ac65dd7dfb00e2866571
-  data.tar.gz: 06d301f58f08a85dd4462dbd7762be108f375fb08cb7108469e236e426039ae6e376fcaff60eb359cde6a33dbcdfec5d7defeece1bf02d46fbbd709c172c2231
+  metadata.gz: 0e21f038652963e54036f7cbebc83b28fac2aa8d37383e5bf7ab3970f12ee96b31a812a4a4717990803b8b36f31b27293f638a14b41c77ad269ccbee4f316882
+  data.tar.gz: fa6f5dcd2ac7d61e5d55f3a8ae0c0e6306e00e426774e70bb1c635839e7d19c769404d0dc0c96e1d6bcf1623c4bc3ff312f6cf5cd5437f3fc13cca49c937d198

data/app/controllers/crud_controller.rb

@@ -4,7 +4,7 @@ class CrudController < ApplicationController
 
   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])
@@ -54,7 +54,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] = I18n.t("mensagem_action", acao: params[:acao])
       else
@@ -145,7 +145,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
 
@@ -199,7 +203,11 @@ class CrudController < ApplicationController
   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])
+      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])
@@ -271,4 +279,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 = "2.0.6"
+  VERSION = "2.0.7"
 end

metadata

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