strip_attributes 1.9.2 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f5a0320df5a7bdf5e4b54823d4d377d90c2e42243d548d98106d462818074b
-  data.tar.gz: e08452bcd46e297a856dcaa16f938dcdfaa4978dcf8438e8aa0e2cb4cbf89f1e
+  metadata.gz: b8e78767cc587a9037bf167a66d1d90d65f0d4cf0b38e67f160d43c04e66d34c
+  data.tar.gz: '0348b7b1d3f81c068ce84277fa1da7213560af9f5a927aab0e23c4bdeca2b52f'
 SHA512:
-  metadata.gz: 8db784d24f9d7e38fc28dce00708223964eb770d0931bcac8ce2e954ce83e74a0f6525f8dac3e01e8670c62c3ba8b8650760caa4e857d71e99fa67653157efa2
-  data.tar.gz: 9451bb01daefe3b3d2624dae4cc0ee010d166eb26f959fcf822fcb1a095cbc0608f9f31461b75367f210301a3b72945a94d48c5f287b4544c38e5183ce76105d
+  metadata.gz: ef6d0002e6b59692efc5f40df76d8af73ec1da8ba1c2ff6887135fdfa4c10628fc635d8adf209872459d2c8bebda3820761a006d086984ef472323ded424e8a4
+  data.tar.gz: d21ad0b0d749ad52ebb5c03b88476d922b9c2034189f01a92b892ddca33e821d7dea02c5d34a33078ef1c4892e3df55791a7f41d0e0f24a6bbc2a1bed66fddec

data/README.md

@@ -1,7 +1,7 @@
 # StripAttributes
 
 [![Gem Version](http://img.shields.io/gem/v/strip_attributes.svg)](https://rubygems.org/gems/strip_attributes)
-[![Build Status](https://secure.travis-ci.org/rmm5t/strip_attributes.svg)](http://travis-ci.org/rmm5t/strip_attributes)
+[![Build Status](https://github.com/rmm5t/strip_attributes/workflows/CI/badge.svg?branch=master)](https://github.com/rmm5t/strip_attributes/actions?query=workflow%3ACI)
 [![Gem Downloads](https://img.shields.io/gem/dt/strip_attributes.svg)](https://rubygems.org/gems/strip_attributes)
 
 StripAttributes is an ActiveModel extension that automatically strips all
@@ -234,7 +234,9 @@ end
 describe User do
   it { is_expected.to strip_attribute(:name).collapse_spaces }
   it { is_expected.to strip_attribute :email }
+  it { is_expected.to strip_attributes(:name, :email) }
   it { is_expected.not_to strip_attribute :password }
+  it { is_expected.not_to strip_attributes(:password, :encrypted_password)  }
 end
 ```
 
@@ -244,7 +246,9 @@ end
 class UserTest < ActiveSupport::TestCase
   should strip_attribute(:name).collapse_spaces
   should strip_attribute :email
+  should strip_attributes(:name, :email)
   should_not strip_attribute :password
+  should_not strip_attributes(:password, :encrypted_password)
 end
 ```
 
@@ -257,7 +261,9 @@ describe User do
   it "should strip attributes" do
     must strip_attribute(:name).collapse_spaces
     must strip_attribute :email
+    must strip_attributes(:name, :email)
     wont strip_attribute :password
+    wont strip_attributes(:password, :encrypted_password)
   end
 end
 ```
@@ -270,7 +276,9 @@ describe User do
 
   must { strip_attribute(:name).collapse_spaces }
   must { strip_attribute :email }
+  must { strip_attributes(:name, :email) }
   wont { strip_attribute :password }
+  wont { strip_attributes(:password, :encrypted_password) }
 end
 ```
 

data/lib/strip_attributes/matchers.rb

@@ -6,26 +6,35 @@ module StripAttributes
     # RSpec Examples:
     #
     #   it { is_expected.to strip_attribute(:first_name) }
+    #   it { is_expected.to strip_attributes(:first_name, :last_name) }
     #   it { is_expected.not_to strip_attribute(:password) }
+    #   it { is_expected.not_to strip_attributes(:password, :encrypted_password) }
     #
     # Minitest Matchers Examples:
     #
     #   must { strip_attribute :first_name }
+    #   must { strip_attributes(:first_name, :last_name) }
     #   wont { strip_attribute :password }
-    def strip_attribute(attribute)
-      StripAttributeMatcher.new(attribute)
+    #   wont { strip_attributes(:password, :encrypted_password) }
+    def strip_attribute(*attributes)
+      StripAttributeMatcher.new(attributes)
     end
 
+    alias_method :strip_attributes, :strip_attribute
+
     class StripAttributeMatcher
-      def initialize(attribute)
-        @attribute = attribute
+      def initialize(attributes)
+        @attributes = attributes
         @options = {}
       end
 
       def matches?(subject)
-        subject.send("#{@attribute}=", " string ")
-        subject.valid?
-        subject.send(@attribute) == "string" and collapse_spaces?(subject)
+        @attributes.all? do |attribute|
+          @attribute = attribute
+          subject.send("#{@attribute}=", " string ")
+          subject.valid?
+          subject.send(@attribute) == "string" and collapse_spaces?(subject)
+        end
       end
 
       def collapse_spaces
@@ -45,7 +54,7 @@ module StripAttributes
       alias_method :negative_failure_message,       :failure_message_when_negated # RSpec 1.1
 
       def description
-        "#{expectation(false)} whitespace from ##{@attribute}"
+        "#{expectation(false)} whitespace from #{@attributes.map {|el| "##{el}" }.to_sentence}"
       end
 
       private

data/lib/strip_attributes/version.rb

@@ -1,3 +1,3 @@
 module StripAttributes
-  VERSION = "1.9.2"
+  VERSION = "1.12.0"
 end

data/lib/strip_attributes.rb

@@ -9,19 +9,12 @@ module ActiveModel::Validations::HelperMethods
       StripAttributes.strip(record, options)
     end
   end
-
-  # <b>DEPRECATED:</b> Please use <tt>strip_attributes</tt> (non-bang method)
-  # instead.
-  def strip_attributes!(options = {})
-    warn "[DEPRECATION] `strip_attributes!` is deprecated.  Please use `strip_attributes` (non-bang method) instead."
-    strip_attributes(options)
-  end
 end
 
 module StripAttributes
   VALID_OPTIONS = [:only, :except, :allow_empty, :collapse_spaces, :replace_newlines, :regex, :if, :unless].freeze
 
-  # Unicode invisible and whitespace characters.  The POSIX character class
+  # Unicode invisible and whitespace characters. The POSIX character class
   # [:space:] corresponds to the Unicode class Z ("separator"). We also
   # include the following characters from Unicode class C ("control"), which
   # are spaces or invisible characters that make no sense at the start or end
@@ -59,28 +52,27 @@ module StripAttributes
 
   def self.strip_string(value, options = {})
     return value unless value.is_a?(String)
+    return value if value.frozen?
 
     allow_empty      = options[:allow_empty]
     collapse_spaces  = options[:collapse_spaces]
     replace_newlines = options[:replace_newlines]
     regex            = options[:regex]
 
-    value = value.strip if value.respond_to?(:strip)
+    value.gsub!(regex, "") if regex
 
-    value.gsub!(regex, "") if regex && value.respond_to?(:gsub!)
-
-    if MULTIBYTE_SUPPORTED && value.respond_to?(:gsub!) && Encoding.compatible?(value, MULTIBYTE_SPACE)
+    if MULTIBYTE_SUPPORTED && Encoding.compatible?(value, MULTIBYTE_SPACE)
       value.gsub!(/\A#{MULTIBYTE_SPACE}+|#{MULTIBYTE_SPACE}+\z/, "")
-    elsif value.respond_to?(:strip!)
+    else
       value.strip!
     end
 
-    value.gsub!(/[\r\n]+/, " ") if replace_newlines && value.respond_to?(:gsub!)
+    value.gsub!(/[\r\n]+/, " ") if replace_newlines
 
     if collapse_spaces
-      if MULTIBYTE_SUPPORTED && value.respond_to?(:gsub!) && Encoding.compatible?(value, MULTIBYTE_BLANK)
+      if MULTIBYTE_SUPPORTED && Encoding.compatible?(value, MULTIBYTE_BLANK)
         value.gsub!(/#{MULTIBYTE_BLANK}+/, " ")
-      elsif value.respond_to?(:squeeze!)
+      else
         value.squeeze!(" ")
       end
     end

data/test/matchers_test.rb

@@ -92,4 +92,14 @@ describe SampleMockRecord do
       assert true
     end
   end
+
+  it "should take a list of arguments" do
+    must strip_attribute(:stripped1, :stripped2, :stripped3)
+    wont strip_attribute(:unstripped1, :unstripped2, :unstripped3)
+  end
+
+  it "should alias strip_attribute to strip_attributes" do
+    must strip_attributes(:stripped1, :stripped2, :stripped3)
+    wont strip_attributes(:unstripped1, :unstripped2, :unstripped3)
+  end
 end

data/test/strip_attributes_test.rb

@@ -13,6 +13,7 @@ module MockAttributes
     base.attribute :qux
     base.attribute :strip_me
     base.attribute :skip_me
+    base.attribute :frozen
   end
 end
 
@@ -203,6 +204,12 @@ class StripAttributesTest < Minitest::Test
     assert_equal "",            record.bang
   end
 
+  def test_should_skip_frozen_values
+    record = StripAllMockRecord.new(frozen: " ice ".freeze)
+    record.valid?
+    assert_equal " ice ", record.frozen
+  end
+
   def test_should_collapse_duplicate_spaces
     record = CollapseDuplicateSpaces.new(@init_params)
     record.valid?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strip_attributes
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.12.0
 platform: ruby
 authors:
 - Ryan McGeary
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,7 +19,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ homepage: https://github.com/rmm5t/strip_attributes
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,8 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Whitespace cleanup for ActiveModel attributes
 test_files: