flay 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ba894eeca0c7966356ccb85f9252f47cf27e2ee34252288502cc70c50aa4d64
-  data.tar.gz: eb4552d71f43350ec698c3ef36a17d0b18b93c65e54666240af786952ed8e512
+  metadata.gz: 3477e1943a1382b0b51cbce9a5e4f5b60c34adc2f38e1e4b713b05f6b7476160
+  data.tar.gz: 042ef82c48aec49077113d53cbe425e6157fd61b36e7118af18dc7369561e77e
 SHA512:
-  metadata.gz: 921301e4deb3c56b8eaf8fa1078ddb20f5bb9a3bf298ecea377df3440b8fc6e17f2475fbc31a1009b66042876289082bf61139bc982293c5530a51975966f793
-  data.tar.gz: 25e52c615125a7d06f59b41d1191dfca7c56a861d1c4a968f188dedd231b9d64fe84ab6c223526af10785e70b488600be4a4840754291b5408056cd9e11f7a82
+  metadata.gz: c05914fd7779c957f60e6e8f32d04a4069d427cf6ecb57b7be97fd53cd9d07969c0076bad6978077f09e47d73a5d7c76c5795233f846a20bc22aef2abbb41dad
+  data.tar.gz: bdcc376f6c7651d1fe4d7ace6349a945a221fc89152bba731719ec4083996b98d98358e6b2506fa58ca6d919dd07d99433f3c6942e0639062909f4e1d55e44e6

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 2.12.0 / 2018-04-29
+
+* 1 minor enhancement:
+
+  * Switched node filtering to happen before processing to avoid subtrees getting processed. Thanks to codeclimate.com for funding this effort!
+
 === 2.11.0 / 2018-04-05
 
 * 2 minor enhancements:

data/lib/flay.rb

@@ -17,7 +17,7 @@ class File
 end
 
 class Flay
-  VERSION = "2.11.0" # :nodoc:
+  VERSION = "2.12.0" # :nodoc:
 
   class Item < Struct.new(:structural_hash, :name, :bonus, :mass, :locations)
     alias identical? bonus
@@ -280,14 +280,26 @@ class Flay
     end
   end
 
+  ##
+  # Before processing, filter any sexp's that match against filters
+  # specified in +option[:filters]+. This changes the sexp itself.
+
+  def filter_sexp exp
+    exp.delete_if { |sexp|
+      if Sexp === sexp then
+        del = option[:filters].any? { |pattern| pattern.satisfy? sexp }
+        del or (filter_sexp(sexp); false)
+      end
+    }
+  end
+
   ##
   # Process a sexp +pt+.
 
   def process_sexp pt
-    pt.deep_each do |node|
+    filter_sexp(pt).deep_each do |node|
       next :skip if node.none? { |sub| Sexp === sub }
       next :skip if node.mass < self.mass_threshold
-      next :skip if option[:filters].any? { |pattern| pattern.satisfy? node }
 
       self.hashes[node.structural_hash] << node
 
@@ -330,22 +342,6 @@ class Flay
     end
   end
 
-  ##
-  # Given an array of sexp patterns (see sexp_processor), delete any
-  # buckets whose members match any of the patterns.
-
-  def filter *patterns
-    return if patterns.empty?
-
-    self.hashes.delete_if { |_, sexps|
-      sexps.any? { |sexp|
-        patterns.any? { |pattern|
-          pattern =~ sexp
-        }
-      }
-    }
-  end
-
   ##
   # Prunes nodes that aren't relevant to analysis or are already
   # covered by another node. Also deletes nodes based on the
@@ -361,8 +357,6 @@ class Flay
     else
       prune_conservatively
     end
-
-    self.filter(*option[:filters])
   end
 
   ##

data/test/test_flay.rb

@@ -450,13 +450,12 @@ class TestSexp < Minitest::Test
     exp_foo = s(:begin,
                 s(:begin,
                   s(:filter_me,
-                    s(:a, s(:b)))))
+                    s(:a, s(:b, s(:c, s(:d)))))))
 
     exp_bar = s(:begin,
                 s(:begin,
                   s(:filter_me,
-                    s(:a, s(:b)),
-                    s(:c))))
+                    s(:a, s(:b, s(:c, s(:d)))))))
 
     filter = Sexp::Matcher.parse("(filter_me ___)")
     options = Flay.default_options.merge(mass: 0, filters: [filter])
@@ -467,8 +466,6 @@ class TestSexp < Minitest::Test
 
     refute_nodes :filter_me
 
-    flay.prune
-
     assert_empty flay.hashes
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flay
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   AhXhF6Wi2GTMezlj5jlI5XV7WsJUSwTp/YiVvcmT74ZaCRvexm6EnNhkrvJJ1Xeu
   V+HB+LYYhXWitInO/eXxDrFB
   -----END CERTIFICATE-----
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor

metadata.gz.sig

@@ -1,3 +1,3 @@
-9�l����J5u���6��tO�
-7���ٞ�g���	��}6��Lf�{���h탸��C�/�o�'V��IwHC6�
-�m@���VxfwQ���M��]2�Ј���4�>?v㤺���fE���$]!��1}-F���`��ܨ���y4q\�5�\��MG�����G�2ޭŔ�����%K���_�z�_�^�8|��U�<p�%�+��:�Wg%h�fΥ7���zB�1���F��![B尗L-%��w���
+�
+���x�����v����#�\��
��]�}gh�%l�]��/���Z+����R�{'�gm�&j�x����n����G${�~�9�����a4�&�R��Rpf]�b�p�mSC�IQ��k�(-~~<\�Z�_�^(����ט`�!e����"�M�jRW�ry��{e�����wRg%�&cn$�b����
+��V��l�����e��_�ӽ��B=C�ܸ��H�H�� |d�넷���߉_��d