active_record_scanner 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fab37beaa2b44ae9245b0ab864f24a1be97d0208
-  data.tar.gz: a6c0cc08c0d95b034bd22259c2841acfbed3834e
+  metadata.gz: 95f6adc89ef62b9b798d8187b552ee9376f068f5
+  data.tar.gz: af9affa7ec8181c1b653cc4d282bb815ae997eb5
 SHA512:
-  metadata.gz: bd7a35be40042ba635dfb3c78268a4f6df0337e77e4ae430c3c979fa268c1cad0a1bd0d30e164c509a7367575c6ed8bba7e72e251f98300f3d95f9f87db0e771
-  data.tar.gz: 16d862d340bc0ae9612e9bf68f172d6be42ec1736f306674b80e3fd9926a3e274ec309ba948694af7e9ba0a7a1d4992fb2dc6cd9a53be5d55eccdca7dad2c9c3
+  metadata.gz: 41ba12e98038345a8900a073958bd3e732f8b51ca0d01db1801db13eb6a6038c1d09e6bf305c45d9a58e79a353cf3f1595ab7e1d76cde9141f5d2edeae27f669
+  data.tar.gz: 2e588035167d386cefe8ad3238d8a742ebad271ff56976c0cd03aaab76fd5f8017b36872bb1742c26450ff12c1153c12365db221dc3be26fbc0c7300679db550

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_record_scanner (0.1.0)
+    active_record_scanner (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/active_record_scanner.rb

@@ -12,21 +12,22 @@ module ActiveRecordScanner
 
     def scan
       Dir.glob(@glob).each do |file|
-        scan_file(file)
+        print "." unless @options[:silent]
+        @file = file
+        raw = IO.binread(file)
+        scan_file(raw)
       end
       @results
     end
 
-    private
-
-    def scan_file(file)
-      print "." unless @options[:silent]
-      @file = file
-      raw = IO.binread(file)
+    def scan_file(raw)
       compact_tree = Parser.new(raw).parse
       scan_for_errors(compact_tree)
+      @results
     end
 
+    private
+
     def report_error(error)
       node = error.last
       @results << "#{@file} (line #{node[2][1]} column #{node[2][0]}) -- called query method '##{node[1]}' in a loop"

data/lib/active_record_scanner/parser.rb

@@ -54,8 +54,13 @@ class Parser
   def normalise!(tree)
     tree.each.with_index do |node, i|
       if node.is_a?(Array)
-        if node.first == :loop
-          tree[i+1][0] = :lblock if tree[i+1]
+        if node.first == :loop && tree[i+1]
+          key = tree[i+1][0]
+          if key == :block
+            tree[i+1][0] = :lblock
+          elsif key == :query # wrap queries like `c.each(&:destroy)` 
+            tree[i+1] = [:lblock, tree[i+1]]
+          end
         end
         tree[i] = normalise!(node)
       end

data/lib/active_record_scanner/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordScanner
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_scanner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sean Goedecke