strip_attributes 1.12.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8e78767cc587a9037bf167a66d1d90d65f0d4cf0b38e67f160d43c04e66d34c
-  data.tar.gz: '0348b7b1d3f81c068ce84277fa1da7213560af9f5a927aab0e23c4bdeca2b52f'
+  metadata.gz: d1206dbea590ab400c94c1ff883cf3152d974b8ce58ff6f7dfaac0b0f7ce3ce1
+  data.tar.gz: 1b3a171cebeed352c7589f680314d26c1c2424c0333b68e8a7400731c39e6f69
 SHA512:
-  metadata.gz: ef6d0002e6b59692efc5f40df76d8af73ec1da8ba1c2ff6887135fdfa4c10628fc635d8adf209872459d2c8bebda3820761a006d086984ef472323ded424e8a4
-  data.tar.gz: d21ad0b0d749ad52ebb5c03b88476d922b9c2034189f01a92b892ddca33e821d7dea02c5d34a33078ef1c4892e3df55791a7f41d0e0f24a6bbc2a1bed66fddec
+  metadata.gz: 1f11fc77e63c2e534600e10eb24fa6f2b4c1823ffe6169442cc20fac5aba9f0fc7eb4dafcac79e17f3cb6b3913a604e721f25cf88e9aa7061944df756234cbb7
+  data.tar.gz: db16a98b6b74993e1badeffce9e8211e71c4eea82861078ec80f0dffb32f7eeabba01989f860692f4b26a22b86bed1301b8bd8534979e8308a0d77e17a441977

data/README.md

@@ -233,6 +233,7 @@ end
 ```ruby
 describe User do
   it { is_expected.to strip_attribute(:name).collapse_spaces }
+  it { is_expected.to strip_attribute(:name).replace_newlines }
   it { is_expected.to strip_attribute :email }
   it { is_expected.to strip_attributes(:name, :email) }
   it { is_expected.not_to strip_attribute :password }
@@ -245,6 +246,7 @@ end
 ```ruby
 class UserTest < ActiveSupport::TestCase
   should strip_attribute(:name).collapse_spaces
+  should strip_attribute(:name).replace_newlines
   should strip_attribute :email
   should strip_attributes(:name, :email)
   should_not strip_attribute :password
@@ -260,6 +262,7 @@ describe User do
 
   it "should strip attributes" do
     must strip_attribute(:name).collapse_spaces
+    must strip_attribute(:name).replace_newlines
     must strip_attribute :email
     must strip_attributes(:name, :email)
     wont strip_attribute :password
@@ -275,6 +278,7 @@ describe User do
   subject { User.new }
 
   must { strip_attribute(:name).collapse_spaces }
+  must { strip_attribute(:name).replace_newlines }
   must { strip_attribute :email }
   must { strip_attributes(:name, :email) }
   wont { strip_attribute :password }

data/Rakefile

@@ -6,6 +6,6 @@ desc "Default: run unit tests."
 task default: :test
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "lib" << "test"
+  t.libs << "test"
   t.pattern = "test/**/*_test.rb"
 end

data/lib/strip_attributes/matchers.rb

@@ -33,7 +33,7 @@ module StripAttributes
           @attribute = attribute
           subject.send("#{@attribute}=", " string ")
           subject.valid?
-          subject.send(@attribute) == "string" and collapse_spaces?(subject)
+          subject.send(@attribute) == "string" and collapse_spaces?(subject) and replace_newlines?(subject)
         end
       end
 
@@ -42,6 +42,11 @@ module StripAttributes
         self
       end
 
+      def replace_newlines
+        @options[:replace_newlines] = true
+        self
+      end
+
       def failure_message # RSpec 3.x
         "Expected whitespace to be #{expectation} from ##{@attribute}, but it was not"
       end
@@ -70,8 +75,17 @@ module StripAttributes
       def expectation(past = true)
         expectation = past ? "stripped" : "strip"
         expectation += past ? " and collapsed" : " and collapse" if @options[:collapse_spaces]
+        expectation += past ? " and replaced" : " and replace" if !@options[:replace_newlines]
         expectation
       end
+
+      def replace_newlines?(subject)
+        return true if !@options[:replace_newlines]
+
+        subject.send("#{@attribute}=", "string\nstring")
+        subject.valid?
+        subject.send(@attribute) == "string string"
+      end
     end
   end
 end

data/lib/strip_attributes/version.rb

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

data/lib/strip_attributes.rb

@@ -83,11 +83,11 @@ module StripAttributes
   # Necessary because Rails has removed the narrowing of attributes using :only
   # and :except on Base#attributes
   def self.narrow(attributes, options = {})
-    if except = options[:except]
-      except = Array(except).collect { |attribute| attribute.to_s }
+    if options[:except]
+      except = Array(options[:except]).map(&:to_s)
       attributes.except(*except)
-    elsif only = options[:only]
-      only = Array(only).collect { |attribute| attribute.to_s }
+    elsif options[:only]
+      only = Array(options[:only]).map(&:to_s)
       attributes.slice(*only)
     else
       attributes
@@ -95,10 +95,7 @@ module StripAttributes
   end
 
   def self.validate_options(options)
-    if keys = options.keys
-      unless (keys - VALID_OPTIONS).empty?
-        raise ArgumentError, "Options does not specify #{VALID_OPTIONS} (#{options.keys.inspect})"
-      end
-    end
+    return if (options.keys - VALID_OPTIONS).empty?
+    raise ArgumentError, "Options does not specify #{VALID_OPTIONS} (#{options.keys.inspect})"
   end
 end

data/test/matchers_test.rb

@@ -18,6 +18,10 @@ class SampleMockRecord < Tableless
   attribute :collapsed
   attribute :uncollapsed
   strip_attributes only: [:collapsed], collapse_spaces: true
+
+  attribute :replaceable
+  attribute :unreplaceable
+  strip_attributes only: [:replaceable], replace_newlines: true
 end
 
 describe SampleMockRecord do
@@ -45,6 +49,14 @@ describe SampleMockRecord do
     it "should not collapse other attributes" do
       wont strip_attribute(:uncollapsed).collapse_spaces
     end
+
+    it "should replace replaceable attributes" do
+      must strip_attribute(:replaceable).replace_newlines
+    end
+
+    it "should not replace on other attributes" do
+      wont strip_attribute(:unreplaceable).replace_newlines
+    end
   else
       must { strip_attribute :stripped1 }
       must { strip_attribute :stripped2 }
@@ -55,6 +67,9 @@ describe SampleMockRecord do
 
       must { strip_attribute(:collapsed).collapse_spaces }
       wont { strip_attribute(:uncollapsed).collapse_spaces }
+
+      must { strip_attribute(:replaceable).replace_newlines }
+      wont { strip_attribute(:unreplaceable).replace_newlines }
   end
 
   it "should fail when testing for strip on an unstripped attribute" do
@@ -93,6 +108,24 @@ describe SampleMockRecord do
     end
   end
 
+  it "should fail when testing for replacement on an unreplaceable attribute" do
+    begin
+      assert_must replace_newlines(:unreplaceable)
+      assert false
+    rescue
+      assert true
+    end
+  end
+
+  it "should fail when testing for no replacement on a replaceable attribute" do
+    begin
+      assert_wont replace_newlines(:replaceable)
+      assert false
+    rescue
+      assert true
+    end
+  end
+
   it "should take a list of arguments" do
     must strip_attribute(:stripped1, :stripped2, :stripped3)
     wont strip_attribute(:unstripped1, :unstripped2, :unstripped3)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strip_attributes
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2024-11-10 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: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
@@ -48,22 +48,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: minitest-matchers_vaccine
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +123,10 @@ files:
 homepage: https://github.com/rmm5t/strip_attributes
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/rmm5t/strip_attributes/issues
+  changelog_uri: https://github.com/rmm5t/strip_attributes/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/rmm5t/strip_attributes
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -145,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Whitespace cleanup for ActiveModel attributes