mutations 0.7.0 → 0.7.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.7.1
+-----------
+
+- Bug fix: If your optional filter discards_empty and strips, then discard whitespace.
+
 0.7.0
 -----------
 

data/lib/mutations/hash_filter.rb

@@ -101,29 +101,29 @@ module Mutations
 
           data_element = data[key]
 
-          # First, discard optional nils/empty params
-          data.delete(key) if !is_required && data.has_key?(key) && filterer.discard_nils? && data_element.nil?
-          data.delete(key) if !is_required && data.has_key?(key) && filterer.discard_empty? && data_element == "" # BUG: this doesn't account for data_elem being " "
-
-          default_used = false
-          if !data.has_key?(key) && filterer.has_default?
-            data_element = filterer.default
-            default_used = true
-          end
-
-          if data.has_key?(key) || default_used
+          if data.has_key?(key)
             sub_data, sub_error = filterer.filter(data_element)
 
             if sub_error.nil?
               filtered_data[key] = sub_data
             elsif !is_required && filterer.discard_invalid?
               data.delete(key)
+            elsif !is_required && sub_error == :empty && filterer.discard_empty?
+              data.delete(key)
+            elsif !is_required && sub_error == :nils && filterer.discard_nils?
+              data.delete(key)
             else
               sub_error = ErrorAtom.new(key, sub_error) if sub_error.is_a?(Symbol)
               errors[key] = sub_error
             end
-          elsif is_required
-            errors[key] = ErrorAtom.new(key, :required)
+          end
+          
+          if !data.has_key?(key)
+            if filterer.has_default?
+              filtered_data[key] = filterer.default
+            elsif is_required
+              errors[key] = ErrorAtom.new(key, :required)
+            end
           end
         end
       end
@@ -134,15 +134,15 @@ module Mutations
         filtered_keys.each do |key|
           data_element = data[key]
 
-          # First, discard optional nils/empty params
-          next if data.has_key?(key) && wildcard_filterer.discard_nils? && data_element.nil?
-          next if data.has_key?(key) && wildcard_filterer.discard_empty? && data_element == ""
-
           sub_data, sub_error = wildcard_filterer.filter(data_element)
           if sub_error.nil?
             filtered_data[key] = sub_data
           elsif wildcard_filterer.discard_invalid?
             data.delete(key)
+          elsif sub_error == :empty && wildcard_filterer.discard_empty?
+            data.delete(key)
+          elsif sub_error == :nils && wildcard_filterer.discard_nils?
+            data.delete(key)
           else
             sub_error = ErrorAtom.new(key, sub_error) if sub_error.is_a?(Symbol)
             errors[key] = sub_error

data/lib/mutations/input_filter.rb

@@ -36,7 +36,7 @@ module Mutations
     end
 
     def discard_invalid?
-      self.options[:discard_invalid]
+      options[:discard_invalid]
     end
   end
 end

data/lib/mutations/version.rb

@@ -1,3 +1,3 @@
 module Mutations
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/hash_filter_spec.rb

@@ -155,6 +155,36 @@ describe "Mutations::HashFilter" do
       assert_equal ({"foo" => "bar"}), filtered
       assert_equal nil, errors
     end
+    
+    it "bar is optional -- discards empty if it needs to be stripped" do
+      hf = Mutations::HashFilter.new do
+        required do
+          string :foo
+        end
+        optional do
+          string :bar, :discard_empty => true
+        end
+      end
+
+      filtered, errors = hf.filter(:foo => "bar", :bar => " ")
+      assert_equal ({"foo" => "bar"}), filtered
+      assert_equal nil, errors
+    end
+    
+    it "bar is optional -- don't discard empty if it's spaces but stripping is off" do
+      hf = Mutations::HashFilter.new do
+        required do
+          string :foo
+        end
+        optional do
+          string :bar, :discard_empty => true, :strip => false
+        end
+      end
+
+      filtered, errors = hf.filter(:foo => "bar", :bar => " ")
+      assert_equal ({"foo" => "bar", "bar" => " "}), filtered
+      assert_equal nil, errors
+    end
 
     it "bar is optional -- errors if discard_empty is false and value is blank" do
       hf = Mutations::HashFilter.new do
@@ -180,7 +210,7 @@ describe "Mutations::HashFilter" do
         end
       end
 
-      filtered, errors = hf.filter(:foo => "bar", :bar => "")
+      filtered, errors = hf.filter(:foo => "bar", :bar => "", :baz => "\t")
       assert_equal ({"foo" => "bar"}), filtered
       assert_equal nil, errors
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mutations
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors: