filter_decrufter 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fecce40a8c9791aef1700866251dc72175bfb7b2
-  data.tar.gz: 6980da08ea0c95878f145ef12ff2ab14e8834dd6
+  metadata.gz: e6f033cc671a5c826ed0f7263fc969bf133ae999
+  data.tar.gz: 1b0541e2781f0cd93b70fea3043f09dfaf5e6afd
 SHA512:
-  metadata.gz: a9bfb7bc2c13ce2cdc3156aeead413c9e63b70d1bf8486f143e81765bb0c52ba09f0735aea3cc26a79009847f720acf3ed2fcec54ea7ff5a21b239ae445e0217
-  data.tar.gz: 49d8d4df671c32e541df18b3f53b6493ad0e5a3000d7ffa92fae57b58a584cb77a2d060ebd468837e012a3d2ed2b9eaec7759609fc72e5be8f84ac26a2980f77
+  metadata.gz: c90de28ef44365692237c502b0bdd1311c28cb69995efe6be3c516d4a8d6bb8367b8e27d7460bb92e46626c7f1f81e122f6c29d2b8cbfeb43f46d05375248e7b
+  data.tar.gz: 7cd8f3acedc1ee1f4496419318706b1f1023c2a58eb204e5a3d70bd4b5ec1264658b557e48243fd6f98b1cd324126c70364832519c3719daa7d386fb933ad024

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.5 (2015-02-28)
+
+* [FIXED] If a filter/action contains both an 'except' and an 'only' constraint and both referred to an unused action, FilterDecrufter will no longer display both as being 'only' constraints.
+* [FIXED] No longer is an exception raised if a filter is defined with multiple methods, e.g., `before_action :foo, :bar, :only => :buz`
+
 ## 0.0.4 (2015-02-27)
 
 * [FIXED] Check for before|after|around_action for Rails 4.2

data/README.md

@@ -25,6 +25,7 @@ Tested with Rails 3.2, 4.0, and 4.2.
 
 # Credits
 
+* [John Moon](http://www.thinkandgrowentrepreneur.com/) - design discussions
+* [Mike Foley](https://twitter.com/m1foley) - filter with multiple method bug report
 * [Sandeep Kumar](https://whatpeoplethink.wordpress.com/) - Rails 4.2 support
 * [Tom Copeland](http://thomasleecopeland.com) - author
-* [John Moon](http://www.thinkandgrowentrepreneur.com/) - design discussions

data/lib/filter_decrufter/checker.rb

@@ -15,8 +15,8 @@ module FilterDecrufter
       action_methods.include?(action_name)
     end
 
-    def populated_only_except_options
-      options.select {|opt_name,opt_value| [:only,:except].include?(opt_name) && !opt_value.empty? }
+    def populated_options_for(name)
+      options.select {|opt_name,opt_value| opt_name == name && !opt_value.empty? }
     end
 
     private
@@ -46,16 +46,14 @@ module FilterDecrufter
 
     def find_problems
       hits.each do |hit|
-        hit.populated_only_except_options.each do |k,v|
-          [:only, :except].each do |constraint_name|
-            check_constraint(constraint_name, hit) if hit.populated_only_except_options[constraint_name].present?
-          end
+        [:only, :except].each do |constraint_name|
+          check_constraint(constraint_name, hit) if hit.populated_options_for(constraint_name)[constraint_name].present?
         end
       end
     end
 
     def check_constraint(name, hit)
-      [hit.populated_only_except_options[name]].flatten.each do |action_syms|
+      [hit.populated_options_for(name)[name]].flatten.each do |action_syms|
         [action_syms].flatten.each do |action_name|
           if !hit.actions_include?(action_name)
             puts "#{hit.controller_class} #{hit.filter_type} '#{hit.filter_name}' has an :#{name} constraint with a non-existent action name '#{action_name}'"
@@ -92,8 +90,12 @@ module FilterDecrufter
 
     def patch_method(filter_sym)
       ApplicationController.define_singleton_method(filter_sym) do |*args, &blk|
-        if args.many? && (args[1][:only].present? || args[1][:except].present?)
-          Report.instance.add(FilterDecrufter::Hit.new(self, args[0], args[1], filter_sym))
+        filter_names = args.select {|a| a.kind_of?(Symbol) }
+        filter_options = args.detect {|a| a.kind_of?(Hash) }
+        if filter_options.present? && (filter_options[:only].present? || filter_options[:except].present?)
+          filter_names.each do |name|
+            Report.instance.add(FilterDecrufter::Hit.new(self, name, filter_options, filter_sym))
+          end
         end
         super(*args, &blk)
       end

data/lib/filter_decrufter/version.rb

@@ -1,3 +1,3 @@
 module FilterDecrufter
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_decrufter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tom Copeland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake