strip_attributes 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e52f0da3132c0ac375581d84279e40f5a118efd62880a094a46cbb99fcf38b2c
-  data.tar.gz: 3ffd42e6130993495406c5b32d5ba93e7b538f85b9295ac9d83f0cae9d65d132
+  metadata.gz: 45ea7e1316e058313b4aa362722d1b3eced15ed144b1c9576ef01834181d9733
+  data.tar.gz: f38bd5fb9ac513e5a72cedaee5caf43e72d2e08c89d1fa9e234f7f30b798b961
 SHA512:
-  metadata.gz: a76db1928d1327ca44d834384679e7a1150e773f414c344d2469b02d144f2f8f103da8cd19664810dbb0d93e7b4dd4fb3a2afed2a8558c8d61a9027d30d23d03
-  data.tar.gz: 4a2085e2618d2d0e661b9b2dffc8741cad0b965a8b4342cc57fedd5a48e13cb70e444feb94ee1688c67051c5d6b747e9ebad29a0486b4a01a4bba34c1f2c32fd
+  metadata.gz: ec101c79b0d25e128b848e233fbc614b87e6bf8ea6e1a8650d1863808cbb862f650ff516b89e569d0e491d3b49cdd995a24c8f37bae2875cc5ad581ef7f31aa3
+  data.tar.gz: 28ceffbb9193abd64abf82bf2e22ff5a492d88255209a627e7e3d03c701bc2a98b370de0d5b7c16ed2cc6c803f3fb3903bceca1b36784dd85f4d44b76c91960d

data/README.md

@@ -15,24 +15,6 @@ a single attribute (`only: :field`) or arrays of attributes (`except: [:field1,
 
 It's also possible to skip stripping the attributes altogether per model using the `:if` and `:unless` options.
 
----
-
-**How You Can Help**
-
-[![Square Cash](http://img.shields.io/badge/square%20cash-$rmm5t-brightgreen.svg)][square]
-[![PayPal](http://img.shields.io/badge/paypal-rmm5t-blue.svg)][paypal]
-[![Book a Codementor session](http://img.shields.io/badge/codementor-book%20a%20session-orange.svg)][codementor]
-
-If you like this project, [buy me a coffee][paypal], or [book a session with me][codementor], or donate bitcoin: `1rmm5tv6f997JK5bLcGbRCZyVjZUPkQ2m`
-
-[square]: https://cash.me/$rmm5t/5 "Donate to rmm5t for open source!"
-[paypal]: https://www.paypal.me/rmm5t/5 "Donate to rmm5t for open source!"
-[bitcoin]: bitcoin:1rmm5tv6f997JK5bLcGbRCZyVjZUPkQ2m?amount=0.01&label=Coffee%20to%20rmm5t%20for%20Open%20Source "Buy rmm5t a coffee for open source!"
-[codementor]: https://www.codementor.io/rmm5t?utm_campaign=profile&utm_source=button-rmm5t&utm_medium=shields "Book a session with rmm5t on Codementor!"
-
-[![Twitter](https://img.shields.io/twitter/follow/rmm5t.svg?style=social)](https://twitter.com/rmm5t)
-[![Stack Overflow](https://img.shields.io/stackexchange/stackoverflow/r/8985.svg?style=social)](http://stackoverflow.com/users/8985/ryan-mcgeary)
-
 ## Installation
 
 Include the gem in your Gemfile:

data/lib/strip_attributes.rb

@@ -19,7 +19,7 @@ module ActiveModel::Validations::HelperMethods
 end
 
 module StripAttributes
-  VALID_OPTIONS = [:only, :except, :allow_empty, :collapse_spaces, :replace_newlines, :regex, :if, :unless]
+  VALID_OPTIONS = [:only, :except, :allow_empty, :collapse_spaces, :replace_newlines, :regex, :if, :unless].freeze
 
   # Unicode invisible and whitespace characters.  The POSIX character class
   # [:space:] corresponds to the Unicode class Z ("separator"). We also
@@ -32,10 +32,10 @@ module StripAttributes
   #   U+200D ZERO WIDTH JOINER
   #   U+2060 WORD JOINER
   #   U+FEFF ZERO WIDTH NO-BREAK SPACE
-  MULTIBYTE_WHITE = "\u180E\u200B\u200C\u200D\u2060\uFEFF"
-  MULTIBYTE_SPACE = /[[:space:]#{MULTIBYTE_WHITE}]/
-  MULTIBYTE_BLANK = /[[:blank:]#{MULTIBYTE_WHITE}]/
-  MULTIBYTE_SUPPORTED  = "\u0020" == " "
+  MULTIBYTE_WHITE = "\u180E\u200B\u200C\u200D\u2060\uFEFF".freeze
+  MULTIBYTE_SPACE = /[[:space:]#{MULTIBYTE_WHITE}]/.freeze
+  MULTIBYTE_BLANK = /[[:blank:]#{MULTIBYTE_WHITE}]/.freeze
+  MULTIBYTE_SUPPORTED = "\u0020" == " "
 
   def self.strip(record_or_string, options = {})
     if record_or_string.respond_to?(:attributes)
@@ -63,13 +63,9 @@ module StripAttributes
     replace_newlines = options[:replace_newlines]
     regex            = options[:regex]
 
-    if value.respond_to?(:strip)
-      value = (value.blank? && !allow_empty) ? nil : value.strip
-    end
+    value = value.strip if value.respond_to?(:strip)
 
-    if regex && value.respond_to?(:gsub!)
-      value.gsub!(regex, "")
-    end
+    value.gsub!(regex, "") if regex && value.respond_to?(:gsub!)
 
     if MULTIBYTE_SUPPORTED && value.respond_to?(:gsub!) && Encoding.compatible?(value, MULTIBYTE_SPACE)
       value.gsub!(/\A#{MULTIBYTE_SPACE}+|#{MULTIBYTE_SPACE}+\z/, "")
@@ -77,9 +73,7 @@ module StripAttributes
       value.strip!
     end
 
-    if replace_newlines && value.respond_to?(:gsub!)
-      value.gsub!(/[\r\n]+/, " ")
-    end
+    value.gsub!(/[\r\n]+/, " ") if replace_newlines && value.respond_to?(:gsub!)
 
     if collapse_spaces
       if MULTIBYTE_SUPPORTED && value.respond_to?(:gsub!) && Encoding.compatible?(value, MULTIBYTE_BLANK)
@@ -89,7 +83,7 @@ module StripAttributes
       end
     end
 
-    value
+    (value.blank? && !allow_empty) ? nil : value
   end
 
   # Necessary because Rails has removed the narrowing of attributes using :only

data/lib/strip_attributes/version.rb

@@ -1,3 +1,3 @@
 module StripAttributes
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 end

data/test/strip_attributes_test.rb

@@ -9,6 +9,8 @@ module MockAttributes
     base.attribute :bang
     base.attribute :foz
     base.attribute :fiz
+    base.attribute :qax
+    base.attribute :qux
     base.attribute :strip_me
     base.attribute :skip_me
   end
@@ -106,7 +108,9 @@ class StripAttributesTest < Minitest::Test
       baz:  "",
       bang: " ",
       foz:  " foz  foz",
-      fiz:  "fiz \n  fiz"
+      fiz:  "fiz \n  fiz",
+      qax:  "\n\t ",
+      qux:  "\u200B"
     }
   end
 
@@ -124,6 +128,8 @@ class StripAttributesTest < Minitest::Test
     assert_equal "fiz \n  fiz", record.fiz
     assert_nil record.baz
     assert_nil record.bang
+    assert_nil record.qax
+    assert_nil record.qux
   end
 
   def test_should_strip_only_one_field

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strip_attributes
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Whitespace cleanup for ActiveModel attributes