brakeman-min 0.2.2 → 0.3.0

data/lib/checks/check_sql.rb

@@ -15,7 +15,11 @@ class CheckSQL < BaseCheck
   def run_check
     @rails_version = tracker.config[:rails_version]
     calls = tracker.find_model_find tracker.models.keys
-    calls.concat tracker.find_call([], /^(find.*|last|first|all|count|sum|average|minumum|maximum)$/)
+
+    calls.concat tracker.find_call([], /^(find.*|last|first|all|count|sum|average|minumum|maximum|count_by_sql)$/)
+
+    calls.concat tracker.find_model_find(nil).select { |result| constantize_call? result }
+
     calls.each do |c|
       process c
     end
@@ -27,7 +31,7 @@ class CheckSQL < BaseCheck
 
     args = process call[3]
 
-    if call[2] == :find_by_sql
+    if call[2] == :find_by_sql or call[2] == :count_by_sql
       failed = check_arguments args[1]
     elsif call[2].to_s =~ /^find/
       failed = (args.length > 2 and check_arguments args[-1])
@@ -121,4 +125,22 @@ class CheckSQL < BaseCheck
 
     false
   end
+
+  #Look for something like this:
+  #
+  # params[:x].constantize.find('something')
+  #
+  # s(:call,
+  #   s(:call,
+  #     s(:call, 
+  #       s(:call, nil, :params, s(:arglist)),
+  #       :[],
+  #       s(:arglist, s(:lit, :x))),
+  #     :constantize,
+  #     s(:arglist)),
+  #   :find,
+  #   s(:arglist, s(:str, "something")))
+  def constantize_call? result
+    sexp? result[-1][1] and result[-1][1][0] == :call and result[-1][1][2] == :constantize
+  end
 end

data/lib/processors/lib/find_model_call.rb

@@ -6,7 +6,7 @@ class FindModelCall < FindCall
 
   #Passes +targets+ to FindCall
   def initialize targets
-    super(targets, /^(find.*|first|last|all)$/)
+    super(targets, /^(find.*|first|last|all|count|sum|average|minumum|maximum|count_by_sql)$/)
   end 
 
   #Matches entire method chain as a target. This differs from

data/lib/version.rb

@@ -1 +1 @@
-Version = "0.2.2"
+Version = "0.3.0"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Justin Collins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -08:00
+date: 2011-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency