strip_attributes 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5061515aff0590e41f315a088c1248a4173afd68
-  data.tar.gz: e5482a0d08c97c52c80de77b4e4ccbfcb60c515d
+SHA256:
+  metadata.gz: 287d7a12033039a5d2f06d55433a9f613ad584886a4add18b78ff6f432455073
+  data.tar.gz: d30d2f78245bfce1534c0509366fa12cbb0bdea7945f2dd97547bb257a926053
 SHA512:
-  metadata.gz: d57177c65fcfe6c9788fcf146de1455c1cb56c0dfa37469028abe123ee4713278ebd0be4b0b1a2dae954c34cf9e6c441f11ea14e1f7b2355d21c5f56c4e3a440
-  data.tar.gz: de6f761513b48057ddc748db448e6d443fa06b9e20b7bff8788a57ddd2a9e7d16810b96571e14df9f69e5615970ba4ec02bfacbef07ec5b9a4313805f83d4d9a
+  metadata.gz: 1e6fbbb056f4ad22e8d4d13c767f3ae2124ede7a7d39e5cffcb9a406be4f590cfbb0f495cf2c6ea0fa8efc1e750e2e333b8eb4467d1ffee582c36deabb2b1417
+  data.tar.gz: ec6311504c2dd730e4810cce0cd72aaf9a2ce5cdbe383214c7e8e46c98cacc82732f8304c90128646c26cc7f99c91227f2cb2f51fcc844d8265e04040db5a688

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2015 Ryan McGeary
+Copyright (c) 2012-2018 Ryan McGeary
 
 MIT License
 

data/README.md

@@ -2,7 +2,6 @@
 
 [![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)
-[![Code Climate](http://img.shields.io/codeclimate/github/rmm5t/strip_attributes.svg)](https://codeclimate.com/github/rmm5t/strip_attributes)
 [![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
@@ -12,8 +11,7 @@ attribute is blank, it strips the value to `nil` by default.
 It works by adding a before_validation hook to the record.  By default, all
 attributes are stripped of whitespace, but `:only` and `:except`
 options can be used to limit which attributes are stripped.  Both options accept
-a single attribute (`:only => :field`) or arrays of attributes (`:except =>
-[:field1, :field2, :field3]`).
+a single attribute (`only: :field`) or arrays of attributes (`except: [:field1, :field2, :field3]`).
 
 ---
 
@@ -56,7 +54,7 @@ end
 ```ruby
 # all attributes will be stripped except :boxers
 class SoberPokerPlayer < ActiveRecord::Base
-  strip_attributes :except => :boxers
+  strip_attributes except: :boxers
 end
 ```
 
@@ -65,7 +63,7 @@ end
 ```ruby
 # only :shoe, :sock, and :glove attributes will be stripped
 class ConservativePokerPlayer < ActiveRecord::Base
-  strip_attributes :only => [:shoe, :sock, :glove]
+  strip_attributes only: [:shoe, :sock, :glove]
 end
 ```
 
@@ -74,7 +72,7 @@ end
 ```ruby
 # Empty attributes will not be converted to nil
 class BrokePokerPlayer < ActiveRecord::Base
-  strip_attributes :allow_empty => true
+  strip_attributes allow_empty: true
 end
 ```
 
@@ -83,7 +81,7 @@ end
 ```ruby
 # Sequential spaces in attributes will be collapsed to one space
 class EloquentPokerPlayer < ActiveRecord::Base
-  strip_attributes :collapse_spaces => true
+  strip_attributes collapse_spaces: true
 end
 ```
 
@@ -92,7 +90,7 @@ end
 ```ruby
 # Newlines in attributes will be replaced with a space
 class EloquentPokerPlayer < ActiveRecord::Base
-  strip_attributes :replace_newlines => true
+  strip_attributes replace_newlines: true
 end
 ```
 
@@ -101,11 +99,16 @@ end
 ```ruby
 class User < ActiveRecord::Base
   # Strip off characters defined by RegEx
-  strip_attributes :only => [:first_name, :last_name], :regex => /[^[:alpha:]\s]/
+  strip_attributes only: [:first_name, :last_name], regex: /[^[:alpha:]\s]/
+
   # Strip off non-integers
-  strip_attributes :only => [:phone], :regex => /[^0-9]/
+  strip_attributes only: :phone, regex: /[^0-9]/
+
   # Strip off all spaces and keep only alphabetic and numeric characters
-  strip_attributes :only => [:nick_name], :regex => /[^[:alnum:]\S]/
+  strip_attributes only: :nickname, regex: /[^[:alnum:]_-]/
+
+  # Remove trailing whitespace from a multi-line string
+  strip_attributes only: :code, regex: /[[:blank:]]+$/)
 end
 ```
 
@@ -118,7 +121,7 @@ It also works on other ActiveModel classes, such as [Mongoid](http://mongoid.org
 ```ruby
 class User
   include Mongoid::Document
-  strip_attributes :only => :email
+  strip_attributes only: :email
 end
 ```
 
@@ -141,11 +144,11 @@ end
 
 ```ruby
 # where record is an ActiveModel instance
-StripAttributes.strip(record, :collapse_spaces => true)
+StripAttributes.strip(record, collapse_spaces: true)
 
 # works directly on Strings too
 StripAttributes.strip(" foo \t") #=> "foo"
-StripAttributes.strip(" foo   bar", :collapse_spaces => true) #=> "foo bar"
+StripAttributes.strip(" foo   bar", collapse_spaces: true) #=> "foo bar"
 ```
 
 ## Testing
@@ -189,7 +192,7 @@ end
 #### To initialize **Minitest-MatchersVaccine**, add this to your `test_helper.rb`:
 
 ```ruby
-require "strip_attributes/matchers_vaccine"
+require "strip_attributes/matchers"
 class MiniTest::Spec
   include StripAttributes::Matchers
 end
@@ -198,7 +201,7 @@ end
 OR if in a Rails environment, you might prefer this:
 
 ``` ruby
-require "strip_attributes/matchers_vaccine"
+require "strip_attributes/matchers"
 class ActiveSupport::TestCase
   include StripAttributes::Matchers
 end
@@ -280,5 +283,4 @@ Semantic Versioning 2.0 as defined at <http://semver.org>.
 
 ## License
 
-Copyright (c) 2007-2015 Ryan McGeary released under the [MIT
-license](http://en.wikipedia.org/wiki/MIT_License)
+[MIT License](https://rmm5t.mit-license.org/)

data/Rakefile

@@ -3,7 +3,7 @@ require "bundler/gem_tasks"
 require "bundler/setup"
 
 desc "Default: run unit tests."
-task :default => :test
+task default: :test
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "lib" << "test"

data/lib/strip_attributes/version.rb

@@ -1,3 +1,3 @@
 module StripAttributes
-  VERSION = "1.8.0"
+  VERSION = "1.8.1"
 end

data/test/matchers_test.rb

@@ -13,11 +13,11 @@ class SampleMockRecord < Tableless
   attribute :unstripped1
   attribute :unstripped2
   attribute :unstripped3
-  strip_attributes :only => [:stripped1, :stripped2, :stripped3]
+  strip_attributes only: [:stripped1, :stripped2, :stripped3]
 
   attribute :collapsed
   attribute :uncollapsed
-  strip_attributes :only => [:collapsed], :collapse_spaces => true
+  strip_attributes only: [:collapsed], collapse_spaces: true
 end
 
 describe SampleMockRecord do

data/test/strip_attributes_test.rb

@@ -19,69 +19,69 @@ end
 
 class StripOnlyOneMockRecord < Tableless
   include MockAttributes
-  strip_attributes :only => :foo
+  strip_attributes only: :foo
 end
 
 class StripOnlyThreeMockRecord < Tableless
   include MockAttributes
-  strip_attributes :only => [:foo, :bar, :biz]
+  strip_attributes only: [:foo, :bar, :biz]
 end
 
 class StripExceptOneMockRecord < Tableless
   include MockAttributes
-  strip_attributes :except => :foo
+  strip_attributes except: :foo
 end
 
 class StripExceptThreeMockRecord < Tableless
   include MockAttributes
-  strip_attributes :except => [:foo, :bar, :biz]
+  strip_attributes except: [:foo, :bar, :biz]
 end
 
 class StripAllowEmpty < Tableless
   include MockAttributes
-  strip_attributes :allow_empty => true
+  strip_attributes allow_empty: true
 end
 
 class CollapseDuplicateSpaces < Tableless
   include MockAttributes
-  strip_attributes :collapse_spaces => true
+  strip_attributes collapse_spaces: true
 end
 
 class ReplaceNewLines < Tableless
   include MockAttributes
-  strip_attributes :replace_newlines => true
+  strip_attributes replace_newlines: true
 end
 
 class ReplaceNewLinesAndDuplicateSpaces < Tableless
   include MockAttributes
-  strip_attributes :replace_newlines => true, :collapse_spaces => true
+  strip_attributes replace_newlines: true, collapse_spaces: true
 end
 
 class CoexistWithOtherValidations < Tableless
-  attribute :number, :type => Integer
+  attribute :number, type: Integer
 
   strip_attributes
   validates :number, {
-    :numericality => { :only_integer => true,  :greater_than_or_equal_to => 1000 },
-    :allow_blank => true
+    numericality: { only_integer: true,  greater_than_or_equal_to: 1000 },
+    allow_blank: true
   }
 end
 
 class StripRegexMockRecord < Tableless
   include MockAttributes
-  strip_attributes :regex => /[\^\%&\*]/
+  strip_attributes regex: /[\^\%&\*]/
 end
 
 class StripAttributesTest < Minitest::Test
   def setup
     @init_params = {
-      :foo  => "\tfoo",
-      :bar  => "bar \t ",
-      :biz  => "\tbiz ",
-      :baz  => "",
-      :bang => " ",
-      :foz  => " foz  foz",
-      :fiz  => "fiz \n  fiz"
+      foo:  "\tfoo",
+      bar:  "bar \t ",
+      biz:  "\tbiz ",
+      baz:  "",
+      bang: " ",
+      foz:  " foz  foz",
+      fiz:  "fiz \n  fiz"
     }
   end
 
@@ -169,8 +169,8 @@ class StripAttributesTest < Minitest::Test
     assert_equal "biz",        record.biz
     assert_equal "foz foz",    record.foz
     assert_equal "fiz \n fiz", record.fiz
-    assert_equal nil,          record.baz
-    assert_equal nil,          record.bang
+    assert_nil record.baz
+    assert_nil record.bang
   end
 
   def test_should_replace_newlines
@@ -181,8 +181,8 @@ class StripAttributesTest < Minitest::Test
     assert_equal "biz",        record.biz
     assert_equal "foz  foz",   record.foz
     assert_equal "fiz    fiz", record.fiz
-    assert_equal nil,          record.baz
-    assert_equal nil,          record.bang
+    assert_nil record.baz
+    assert_nil record.bang
   end
 
   def test_should_replace_newlines_and_duplicate_spaces
@@ -193,8 +193,8 @@ class StripAttributesTest < Minitest::Test
     assert_equal "biz",     record.biz
     assert_equal "foz foz", record.foz
     assert_equal "fiz fiz", record.fiz
-    assert_equal nil,       record.baz
-    assert_equal nil,       record.bang
+    assert_nil record.baz
+    assert_nil record.bang
   end
 
   def test_should_strip_and_allow_empty_always
@@ -217,18 +217,18 @@ class StripAttributesTest < Minitest::Test
     assert !record.valid?, "Expected record to be invalid"
     assert record.errors.include?(:number), "Expected record to have an error on :number"
 
-    record = CoexistWithOtherValidations.new(:number => " 1000.2 ")
+    record = CoexistWithOtherValidations.new(number: " 1000.2 ")
     assert !record.valid?, "Expected record to be invalid"
     assert record.errors.include?(:number), "Expected record to have an error on :number"
 
-    # record = CoexistWithOtherValidations.new(:number => " 1000 ")
+    # record = CoexistWithOtherValidations.new(number: " 1000 ")
     # assert record.valid?, "Expected record to be valid, but got #{record.errors.full_messages}"
     # assert !record.errors.include?(:number), "Expected record to have no errors on :number"
   end
 
   def test_should_strip_regex
     record = StripRegexMockRecord.new
-    record.assign_attributes(@init_params.merge(:foo => "^%&*abc  "))
+    record.assign_attributes(@init_params.merge(foo: "^%&*abc  "))
     record.valid?
     assert_equal "abc",        record.foo
     assert_equal "bar",        record.bar
@@ -237,39 +237,62 @@ class StripAttributesTest < Minitest::Test
   def test_should_strip_unicode
     skip "multi-byte characters not supported by this version of Ruby" unless StripAttributes::MULTIBYTE_SUPPORTED
 
-    record = StripOnlyOneMockRecord.new({:foo => "\u200A\u200B foo\u200A\u200B\u00A0 "})
+    record = StripOnlyOneMockRecord.new({foo: "\u200A\u200B foo\u200A\u200B\u00A0 "})
     record.valid?
     assert_equal "foo",      record.foo
   end
 
   class ClassMethodsTest < Minitest::Test
     def test_should_strip_whitespace
-      assert_equal nil, StripAttributes.strip("")
-      assert_equal nil, StripAttributes.strip(" \t ")
+      assert_nil StripAttributes.strip("")
+      assert_nil StripAttributes.strip(" \t ")
       assert_equal "thirty six", StripAttributes.strip(" thirty six \t \n")
     end
 
     def test_should_allow_empty
-      assert_equal "", StripAttributes.strip("", :allow_empty => true)
-      assert_equal "", StripAttributes.strip(" \t ", :allow_empty => true)
+      assert_equal "", StripAttributes.strip("", allow_empty: true)
+      assert_equal "", StripAttributes.strip(" \t ", allow_empty: true)
     end
 
     def test_should_collapse_spaces
-      assert_equal "1 2 3", StripAttributes.strip(" 1   2   3\t ", :collapse_spaces => true)
+      assert_equal "1 2 3", StripAttributes.strip(" 1   2   3\t ", collapse_spaces: true)
     end
 
     def test_should_collapse_multibyte_spaces
-      assert_equal "1 2 3", StripAttributes.strip(" 1 \u00A0  2\u00A03\t ", :collapse_spaces => true)
+      assert_equal "1 2 3", StripAttributes.strip(" 1 \u00A0  2\u00A03\t ", collapse_spaces: true)
     end
 
     def test_should_replace_newlines
-      assert_equal "1 2", StripAttributes.strip("1\n2", :replace_newlines => true)
-      assert_equal "1 2", StripAttributes.strip("1\r\n2", :replace_newlines => true)
-      assert_equal "1 2", StripAttributes.strip("1\r2", :replace_newlines => true)
+      assert_equal "1 2", StripAttributes.strip("1\n2", replace_newlines: true)
+      assert_equal "1 2", StripAttributes.strip("1\r\n2", replace_newlines: true)
+      assert_equal "1 2", StripAttributes.strip("1\r2", replace_newlines: true)
     end
 
     def test_should_strip_regex
-      assert_equal "abc", StripAttributes.strip("^%&*abc  ^  ", :regex => /[\^\%&\*]/)
+      assert_equal "abc", StripAttributes.strip("^%&*abc  ^  ", regex: /[\^\%&\*]/)
+    end
+
+    def test_should_keep_only_alphanumerics
+      nickname = " funky BAT-2009"
+      assert_equal "funkyBAT-2009", StripAttributes.strip(nickname, regex: /[^[:alnum:]_-]/)
+    end
+
+    def test_should_strip_trailing_whitespace
+      messy_code =
+        "const hello = (name) => {      \n" +
+        "  if (name === 'voldemort') return; \n" +
+        "  \n" +
+        "  console.log(`Hello ${name}!`); \t \t \n" +
+        "};  \n"
+      expected = <<~EOF.strip
+        const hello = (name) => {
+          if (name === 'voldemort') return;
+
+          console.log(`Hello ${name}!`);
+        };
+      EOF
+      actual = StripAttributes.strip(messy_code, regex: /[[:blank:]]+$/)
+      assert_equal expected, actual
     end
 
     def test_should_strip_unicode

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strip_attributes
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2019-01-22 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: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -138,15 +138,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Whitespace cleanup for ActiveModel attributes