mutations 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4a28329a36aca21130a7a521f6833ad47ce35f31d0c1014c432eafbdad667b5
-  data.tar.gz: 5b085b2e98b416ff440b6842b556bad82b7c6d38e233828f0a84a192dcb2ee0a
+  metadata.gz: e8910273a1df86a4c215e9b4878698f4c74f88b1756f7df8145b116ebeff92e2
+  data.tar.gz: 8f8e311fe7f030469ba62e473e5bc63f45af913640e670b19d7255f8ed5f20f8
 SHA512:
-  metadata.gz: 80ceb34a91da980b81eae6f47e26c967a03c7a11d49afa7da6646236c7a39ccee2936471abb12d66a43269231cbff889b03ca01ed0c5978fffeedf11e8b2fcfb
-  data.tar.gz: ad443a9ce7ed66004ddf09454315902a0a47d161c9a732a70d0f26e532d000ba86a51f83da1dbbef08dc96145a322cf26834f02f1a8b92a341b15f6f2f387fec
+  metadata.gz: fc69d3c607ee357701a72293b9233d652017d3e9b65c3d7b59dc3c4290fafda020189e769c8dc70fbf32645e3141225f5395d05f91c9dda63f4ce10d09e5e1a3
+  data.tar.gz: 2e3f1114e8aaee8a264a68aa4ef90cca33bf14d5629d8b71864c238749b77c02a61d2e1651990b27e3d808e1e3808b90c2c107380a52df0988da7ed8b5b90a9c

data/.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby-version:
+          - 2.1
+          - 2.2
+          - 2.3
+          - 2.4
+          - 2.5
+          - 2.6
+          - 2.7
+          - '3.0'
+          - 3.1
+          - 3.2
+          - 3.3
+          - 3.4
+          - 4.0
+          - jruby
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - run: bundle exec rake test

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.9.2
+-----------
+ - Optimize control char stripping (#167, @byroot)
+
 0.9.1
 -----------
  - Treat blank strings as nil when `strip` and `empty_is_nil` options are set (#148, @saverio-kantox)

data/lib/mutations/string_filter.rb

@@ -14,6 +14,9 @@ module Mutations
       :allow_control_characters => false    # false removes control characters from the string
     }
 
+    CONTROL_CHARS = ((0..31).map(&:chr) - ["\r", "\n", "\t"]).join.freeze
+    REPLACE = (" " * CONTROL_CHARS.bytesize).freeze
+
     def filter(data)
       # Handle nil case
       if data.nil?
@@ -28,7 +31,7 @@ module Mutations
       return [data, :string] unless data.is_a?(String)
 
       # At this point, data is a string. Now remove control characters from the string:
-      data = data.gsub(/((?=[[:cntrl:]])[^\t\r\n])+/, ' ') unless options[:allow_control_characters]
+      data = data.tr_s(CONTROL_CHARS, REPLACE) unless options[:allow_control_characters]
 
       # Transform it using strip:
       data = data.strip if options[:strip]

data/lib/mutations/version.rb

@@ -1,3 +1,3 @@
 module Mutations
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/mutations.gemspec

@@ -14,6 +14,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.add_dependency "activesupport"
-  s.add_development_dependency 'minitest', '~> 4'
+  s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'
 end

data/spec/additional_filter_spec.rb

@@ -39,7 +39,7 @@ describe "Mutations::AdditionalFilter" do
     it "should recognize additional filters" do
       outcome = TestCommandUsingAdditionalFilters.run(:first_name => "John", :last_name => "Doe")
       assert outcome.success?
-      assert_equal nil, outcome.errors
+      assert_nil outcome.errors
     end
 
     class TestCommandUsingAdditionalFiltersInHashes < Mutations::Command
@@ -60,7 +60,7 @@ describe "Mutations::AdditionalFilter" do
       )
 
       assert outcome.success?
-      assert_equal nil, outcome.errors
+      assert_nil outcome.errors
     end
 
     class TestCommandUsingAdditionalFiltersInArrays < Mutations::Command
@@ -81,7 +81,7 @@ describe "Mutations::AdditionalFilter" do
       )
 
       assert outcome.success?
-      assert_equal nil, outcome.errors
+      assert_nil outcome.errors
     end
 
     module Mutations

data/spec/array_filter_spec.rb

@@ -9,7 +9,7 @@ describe "Mutations::ArrayFilter" do
     f = Mutations::ArrayFilter.new(:arr)
     filtered, errors = f.filter([1])
     assert_equal [1], filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "considers non-arrays to be invalid" do
@@ -23,7 +23,7 @@ describe "Mutations::ArrayFilter" do
   it "considers nil to be invalid" do
     f = Mutations::ArrayFilter.new(:arr, :nils => false)
     filtered, errors = f.filter(nil)
-    assert_equal nil, filtered
+    assert_nil filtered
     assert_equal :nils, errors
   end
 
@@ -31,20 +31,20 @@ describe "Mutations::ArrayFilter" do
     f = Mutations::ArrayFilter.new(:arr, :nils => true)
     _filtered, errors = f.filter(nil)
     _filtered, errors = f.filter(nil)
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "lets you specify a class, and has valid elements" do
     f = Mutations::ArrayFilter.new(:arr, :class => Integer)
     filtered, errors = f.filter([1,2,3])
-    assert_equal nil, errors
+    assert_nil errors
     assert_equal [1,2,3], filtered
   end
 
   it "lets you specify a class as a string, and has valid elements" do
     f = Mutations::ArrayFilter.new(:arr, :class => 'Integer')
     filtered, errors = f.filter([1,2,3])
-    assert_equal nil, errors
+    assert_nil errors
     assert_equal [1,2,3], filtered
   end
 
@@ -125,7 +125,7 @@ describe "Mutations::ArrayFilter" do
 
     filtered, errors = f.filter([true, false, "1"])
     assert_equal [true, false, true], filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "lets you pass model in arrays" do
@@ -133,7 +133,7 @@ describe "Mutations::ArrayFilter" do
 
     filtered, errors = f.filter(["hey"])
     assert_equal ["hey"], filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "lets you pass hashes in arrays" do
@@ -153,8 +153,8 @@ describe "Mutations::ArrayFilter" do
     filtered, errors = f.filter([{:foo => "f", :bar => 3, :baz => true}, {:foo => "f", :bar => 3}, {:foo => "f"}])
     assert_equal [{:foo=>"f", :bar=>3, :baz=>true}, {:foo=>"f", :bar=>3}, {:foo=>"f"}], filtered
 
-    assert_equal nil, errors[0]
-    assert_equal nil, errors[1]
+    assert_nil errors[0]
+    assert_nil errors[1]
     assert_equal({"bar"=>:required}, errors[2].symbolic)
   end
 
@@ -167,7 +167,7 @@ describe "Mutations::ArrayFilter" do
 
     filtered, errors = f.filter([["h", "e"], ["l"], [], ["lo"]])
     assert_equal filtered, [["h", "e"], ["l"], [], ["lo"]]
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "handles errors for arrays of arrays" do
@@ -189,14 +189,14 @@ describe "Mutations::ArrayFilter" do
     end
     filtered, errors = f.filter([1, "2", "three", "4", 5, [6]])
     assert_equal [1,2,4,5], filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "considers long arrays to be valid" do
     f = Mutations::ArrayFilter.new(:arr, :min_length => 2)
     filtered, errors = f.filter([1, 2])
     assert_equal [1, 2], filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "considers short arrays to be invalid" do
@@ -210,7 +210,7 @@ describe "Mutations::ArrayFilter" do
     f = Mutations::ArrayFilter.new(:arr, :max_length => 20)
     filtered, errors = f.filter([1])
     assert_equal [1], filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
   
   it "sets a max_length for the array of 2 with 5 as invalid" do
@@ -229,7 +229,7 @@ describe "Mutations::ArrayFilter" do
     m = SimpleModel.new
     filtered, errors = f.filter([m])
     assert_equal [m], filtered
-    assert_equal nil, errors
+    assert_nil errors
 
     Object.send(:remove_const, 'SimpleModel')
     class SimpleModel; end
@@ -251,7 +251,7 @@ describe "Mutations::ArrayFilter" do
     m = SimpleModel.new
     filtered, errors = f.filter([m])
     assert_equal [m], filtered
-    assert_equal nil, errors
+    assert_nil errors
 
     Object.send(:remove_const, 'SimpleModel')
     class SimpleModel; end
@@ -259,7 +259,7 @@ describe "Mutations::ArrayFilter" do
     m = SimpleModel.new
     filtered, errors = f.filter([m])
     assert_equal [m], filtered
-    assert_equal nil, errors
+    assert_nil errors
 
     Mutations.cache_constants = was
   end

data/spec/boolean_filter_spec.rb

@@ -6,11 +6,11 @@ describe "Mutations::BooleanFilter" do
     f = Mutations::BooleanFilter.new
     filtered, errors = f.filter(true)
     assert_equal true, filtered
-    assert_equal nil, errors
+    assert_nil errors
 
     filtered, errors = f.filter(false)
     assert_equal false, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "considers non-booleans to be invalid" do
@@ -24,15 +24,15 @@ describe "Mutations::BooleanFilter" do
   it "considers nil to be invalid" do
     f = Mutations::BooleanFilter.new(:nils => false)
     filtered, errors = f.filter(nil)
-    assert_equal nil, filtered
+    assert_nil filtered
     assert_equal :nils, errors
   end
 
   it "considers nil to be valid" do
     f = Mutations::BooleanFilter.new(:nils => true)
     filtered, errors = f.filter(nil)
-    assert_equal nil, filtered
-    assert_equal nil, errors
+    assert_nil filtered
+    assert_nil errors
   end
 
   it "considers certain strings to be valid booleans" do
@@ -40,7 +40,7 @@ describe "Mutations::BooleanFilter" do
     [["true", true], ["TRUE", true], ["TrUe", true], ["1", true], ["false", false], ["FALSE", false], ["FalSe", false], ["0", false], [0, false], [1, true]].each do |(str, v)|
       filtered, errors = f.filter(str)
       assert_equal v, filtered
-      assert_equal nil, errors
+      assert_nil errors
     end
   end
   

data/spec/command_spec.rb

@@ -9,7 +9,7 @@ describe "Command" do
 
       assert outcome.success?
       assert_equal({:name => "John", :email => "john@gmail.com", :amount => 5}.stringify_keys, outcome.result)
-      assert_equal nil, outcome.errors
+      assert_nil outcome.errors
     end
 
     it "should filter out spurious params" do
@@ -17,7 +17,7 @@ describe "Command" do
 
       assert outcome.success?
       assert_equal({:name => "John", :email => "john@gmail.com", :amount => 5}.stringify_keys, outcome.result)
-      assert_equal nil, outcome.errors
+      assert_nil outcome.errors
     end
 
     it "should discover errors in inputs" do
@@ -70,7 +70,7 @@ describe "Command" do
 
       assert !outcome.success?
       assert_equal :max_length, outcome.errors.symbolic[:name]
-      assert_equal nil, outcome.errors.symbolic[:email]
+      assert_nil outcome.errors.symbolic[:email]
     end
 
     it "should merge multiple hashes" do

data/spec/date_filter_spec.rb

@@ -6,7 +6,7 @@ describe "Mutations::DateFilter" do
     f = Mutations::DateFilter.new
     filtered, errors = f.filter(date)
     assert_equal date, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
   
   it "takes a DateTime object" do
@@ -14,7 +14,7 @@ describe "Mutations::DateFilter" do
     f = Mutations::DateFilter.new
     filtered, errors = f.filter(date)
     assert_equal date, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
   
   it "takes a Time object and converts it to a date" do
@@ -22,7 +22,7 @@ describe "Mutations::DateFilter" do
     f = Mutations::DateFilter.new
     filtered, errors = f.filter(time)
     assert_equal time.to_date, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "checks if the given date is after a certain date" do
@@ -32,7 +32,7 @@ describe "Mutations::DateFilter" do
     filtered, errors = f.filter(date)
 
     assert_equal date, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "gives errors when the given date is before the after date" do
@@ -41,7 +41,7 @@ describe "Mutations::DateFilter" do
     f = Mutations::DateFilter.new(:after => after_date)
     filtered, errors = f.filter(date)
 
-    assert_equal nil, filtered
+    assert_nil filtered
     assert_equal :after, errors
   end
 
@@ -52,7 +52,7 @@ describe "Mutations::DateFilter" do
     filtered, errors = f.filter(date)
 
     assert_equal date, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "gives errors when the given date is after the before date" do
@@ -61,7 +61,7 @@ describe "Mutations::DateFilter" do
     f = Mutations::DateFilter.new(:before => before_date)
     filtered, errors = f.filter(date)
 
-    assert_equal nil, filtered
+    assert_nil filtered
     assert_equal :before, errors
   end
 
@@ -73,7 +73,7 @@ describe "Mutations::DateFilter" do
     filtered, errors = f.filter(date)
 
     assert_equal date, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "should be able to parse a D-M-Y string to a date" do
@@ -83,7 +83,7 @@ describe "Mutations::DateFilter" do
     filtered, errors = f.filter(date_string)
 
     assert_equal date, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "should be able to parse a Y-M-D string to a date" do
@@ -93,7 +93,7 @@ describe "Mutations::DateFilter" do
     filtered, errors = f.filter(date_string)
 
     assert_equal date, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "should be able to handle date formatting" do
@@ -103,21 +103,21 @@ describe "Mutations::DateFilter" do
     filtered, errors = f.filter(date_string)
 
     assert_equal date, filtered
-    assert_equal nil, errors
+    assert_nil errors
 
     date_string = "1, 2, 2000"
     f = Mutations::DateFilter.new(:format => '%m, %d, %Y')
     filtered, errors = f.filter(date_string)
 
     assert_equal date, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "considers nil to be invalid" do
     f = Mutations::DateFilter.new
     filtered, errors = f.filter(nil)
 
-    assert_equal nil, filtered
+    assert_nil filtered
     assert_equal :nils, errors
   end
 
@@ -132,8 +132,8 @@ describe "Mutations::DateFilter" do
     f = Mutations::DateFilter.new(:nils => true)
     filtered, errors = f.filter(nil)
 
-    assert_equal nil, filtered
-    assert_equal nil, errors
+    assert_nil filtered
+    assert_nil errors
   end
 
   it "considers empty strings to be nil if empty_is_nil option is used" do
@@ -145,8 +145,8 @@ describe "Mutations::DateFilter" do
   it "returns empty strings as nil if empty_is_nil option is used" do
     f = Mutations::DateFilter.new(:empty_is_nil => true, :nils => true)
     filtered, errors = f.filter("")
-    assert_equal nil, filtered
-    assert_equal nil, errors
+    assert_nil filtered
+    assert_nil errors
   end
 
   it "doesn't allow non-existing dates" do
@@ -154,7 +154,7 @@ describe "Mutations::DateFilter" do
     f = Mutations::DateFilter.new
     filtered, errors = f.filter(date_string)
 
-    assert_equal nil, filtered
+    assert_nil filtered
     assert_equal :date, errors
   end
 end

data/spec/duck_filter_spec.rb

@@ -6,11 +6,11 @@ describe "Mutations::DuckFilter" do
     f = Mutations::DuckFilter.new(:methods => [:length])
     filtered, errors = f.filter("test")
     assert_equal "test", filtered
-    assert_equal nil, errors
+    assert_nil errors
 
     filtered, errors = f.filter([1, 2])
     assert_equal [1, 2], filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "doesn't allow objects that respond to a single specified method" do
@@ -27,15 +27,15 @@ describe "Mutations::DuckFilter" do
   it "considers nil to be invalid" do
     f = Mutations::DuckFilter.new(:nils => false)
     filtered, errors = f.filter(nil)
-    assert_equal nil, filtered
+    assert_nil filtered
     assert_equal :nils, errors
   end
 
   it "considers nil to be valid" do
     f = Mutations::DuckFilter.new(:nils => true)
     filtered, errors = f.filter(nil)
-    assert_equal nil, filtered
-    assert_equal nil, errors
+    assert_nil filtered
+    assert_nil errors
   end
 
   it "Allows anything if no methods are specified" do
@@ -43,7 +43,7 @@ describe "Mutations::DuckFilter" do
     [true, "hi", 1, [1, 2, 3]].each do |v|
       filtered, errors = f.filter(v)
       assert_equal v, filtered
-      assert_equal nil, errors
+      assert_nil errors
     end
   end
 end

data/spec/file_filter_spec.rb

@@ -13,7 +13,7 @@ describe "Mutations::FileFilter" do
     f = Mutations::FileFilter.new
     filtered, errors = f.filter(file)
     assert_equal file, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "allows files - stringio class" do
@@ -21,7 +21,7 @@ describe "Mutations::FileFilter" do
     f = Mutations::FileFilter.new
     filtered, errors = f.filter(file)
     assert_equal file, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "allows files - tempfile" do
@@ -29,7 +29,7 @@ describe "Mutations::FileFilter" do
     f = Mutations::FileFilter.new
     filtered, errors = f.filter(file)
     assert_equal file, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "doesn't allow non-files" do
@@ -46,15 +46,15 @@ describe "Mutations::FileFilter" do
   it "considers nil to be invalid" do
     f = Mutations::FileFilter.new(:nils => false)
     filtered, errors = f.filter(nil)
-    assert_equal nil, filtered
+    assert_nil filtered
     assert_equal :nils, errors
   end
 
   it "considers nil to be valid" do
     f = Mutations::FileFilter.new(:nils => true)
     filtered, errors = f.filter(nil)
-    assert_equal nil, filtered
-    assert_equal nil, errors
+    assert_nil filtered
+    assert_nil errors
   end
   
   it "considers empty strings to be empty" do
@@ -68,7 +68,7 @@ describe "Mutations::FileFilter" do
     f = Mutations::FileFilter.new(:size => 4)
     filtered, errors = f.filter(file)
     assert_equal file, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "shouldn't allow big files" do
@@ -84,7 +84,7 @@ describe "Mutations::FileFilter" do
     f = Mutations::FileFilter.new(:upload => true)
     filtered, errors = f.filter(file)
     assert_equal file, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "should require extra methods if uploaded file: deny" do

data/spec/float_filter_spec.rb

@@ -6,42 +6,42 @@ describe "Mutations::FloatFilter" do
     f = Mutations::FloatFilter.new
     filtered, errors = f.filter(3.1415926)
     assert_equal 3.1415926, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "allows strings that start with a digit" do
     f = Mutations::FloatFilter.new
     filtered, errors = f.filter("3")
     assert_equal 3.0, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "allows string representation of float" do
     f = Mutations::FloatFilter.new
     filtered, errors = f.filter("3.14")
     assert_equal 3.14, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "allows string representation of float without a number before dot" do
     f = Mutations::FloatFilter.new
     filtered, errors = f.filter(".14")
     assert_equal 0.14, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "allows negative strings" do
     f = Mutations::FloatFilter.new
     filtered, errors = f.filter("-.14")
     assert_equal(-0.14, filtered)
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "allows strings with a positive sign" do
     f = Mutations::FloatFilter.new
     filtered, errors = f.filter("+.14")
     assert_equal 0.14, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "doesnt't allow other strings, nor does it allow random objects or symbols" do
@@ -55,15 +55,15 @@ describe "Mutations::FloatFilter" do
   it "considers nil to be invalid" do
     f = Mutations::FloatFilter.new(:nils => false)
     filtered, errors = f.filter(nil)
-    assert_equal nil, filtered
+    assert_nil filtered
     assert_equal :nils, errors
   end
 
   it "considers nil to be valid" do
     f = Mutations::FloatFilter.new(:nils => true)
     filtered, errors = f.filter(nil)
-    assert_equal nil, filtered
-    assert_equal nil, errors
+    assert_nil filtered
+    assert_nil errors
   end
   
   it "considers empty strings to be empty" do
@@ -83,7 +83,7 @@ describe "Mutations::FloatFilter" do
     f = Mutations::FloatFilter.new(:min => 10)
     filtered, errors = f.filter(31)
     assert_equal 31, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
   it "considers high numbers invalid" do
@@ -97,7 +97,7 @@ describe "Mutations::FloatFilter" do
     f = Mutations::FloatFilter.new(:max => 10)
     filtered, errors = f.filter(3)
     assert_equal 3, filtered
-    assert_equal nil, errors
+    assert_nil errors
   end
 
 end