strip_attributes 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 911cd69ac1b20e523a98773595a73bc6565b3bf8
-  data.tar.gz: d1c028269597585f708da5a25010c74f1d1a2fc4
+  metadata.gz: 5061515aff0590e41f315a088c1248a4173afd68
+  data.tar.gz: e5482a0d08c97c52c80de77b4e4ccbfcb60c515d
 SHA512:
-  metadata.gz: 833b16931b77d3c55f291b619a23a23ac69cd9ad2d52bcaa04adb66223bb059ce3392a1da254200a63107c1694619fb0822d450c913e58da4752ae69f8896d7d
-  data.tar.gz: 0f084d7a1afbbfa54112c07ff46cfcc2e04950aad990f94ed3d3ed3cf6e8f1962473c3f8bcedb7029ac7bb6dd6ca3a9483c83242c98b9a4e0d9399006c89f6a8
+  metadata.gz: d57177c65fcfe6c9788fcf146de1455c1cb56c0dfa37469028abe123ee4713278ebd0be4b0b1a2dae954c34cf9e6c441f11ea14e1f7b2355d21c5f56c4e3a440
+  data.tar.gz: de6f761513b48057ddc748db448e6d443fa06b9e20b7bff8788a57ddd2a9e7d16810b96571e14df9f69e5615970ba4ec02bfacbef07ec5b9a4313805f83d4d9a

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2012-2015 Ryan McGeary
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,9 @@
-# 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) [![Code Climate](http://img.shields.io/codeclimate/github/rmm5t/strip_attributes.svg)](https://codeclimate.com/github/rmm5t/strip_attributes)
+# 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)
+[![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
 attributes of leading and trailing whitespace before validation. If the
@@ -15,18 +20,19 @@ a single attribute (`:only => :field`) or arrays of attributes (`:except =>
 **How You Can Help**
 
 [![Square Cash](http://img.shields.io/badge/square%20cash-$rmm5t-brightgreen.svg)][square]
-[![Gratipay](http://img.shields.io/gratipay/rmm5t.svg)][gratipay]
+[![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][square], [donate via Gratipay][gratipay], or [book a session with me on Codementor][codementor].
-
-Bitcoin: `1rmm5tv6f997JK5bLcGbRCZyVjZUPkQ2m`
+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 "Donate to rmm5t for open source!"
-[gratipay]: https://gratipay.com/rmm5t/ "Donate to rmm5t for open source!"
+[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:
@@ -147,11 +153,13 @@ StripAttributes.strip(" foo   bar", :collapse_spaces => true) #=> "foo bar"
 StripAttributes provides an RSpec/Shoulda-compatible matcher for easier
 testing of attribute assignment. You can use this with
 [RSpec](http://rspec.info/), [Shoulda](https://github.com/thoughtbot/shoulda),
-or [Minitest-Matchers](https://github.com/zenspider/minitest-matchers).
+[Minitest-MatchersVaccine](https://github.com/rmm5t/minitest-matchers_vaccine)
+(preferred), or
+[Minitest-Matchers](https://github.com/wojtekmach/minitest-matchers).
 
 ### Setup `spec_helper.rb` or `test_helper.rb`
 
-To initialize **RSpec**, add this to your `spec_helper.rb`:
+#### To initialize **RSpec**, add this to your `spec_helper.rb`:
 
 ```ruby
 require "strip_attributes/matchers"
@@ -160,7 +168,7 @@ RSpec.configure do |config|
 end
 ```
 
-To initialize **Shoulda (with test-unit)**, add this to your `test_helper.rb`:
+#### To initialize **Shoulda (with test-unit)**, add this to your `test_helper.rb`:
 
 ```ruby
 require "strip_attributes/matchers"
@@ -169,7 +177,34 @@ class Test::Unit::TestCase
 end
 ```
 
-To initialize **Minitest-Matchers**, add this to your `test_helper.rb`:
+OR if in a Rails environment, you might prefer this:
+
+``` ruby
+require "strip_attributes/matchers"
+class ActiveSupport::TestCase
+  extend StripAttributes::Matchers
+end
+```
+
+#### To initialize **Minitest-MatchersVaccine**, add this to your `test_helper.rb`:
+
+```ruby
+require "strip_attributes/matchers_vaccine"
+class MiniTest::Spec
+  include StripAttributes::Matchers
+end
+```
+
+OR if in a Rails environment, you might prefer this:
+
+``` ruby
+require "strip_attributes/matchers_vaccine"
+class ActiveSupport::TestCase
+  include StripAttributes::Matchers
+end
+```
+
+#### To initialize **Minitest-Matchers**, add this to your `test_helper.rb`:
 
 ```ruby
 require "strip_attributes/matchers"
@@ -200,6 +235,20 @@ class UserTest < ActiveSupport::TestCase
 end
 ```
 
+**Minitest-MatchersVaccine**:
+
+```ruby
+describe User do
+  subject { User.new }
+
+  it "should strip attributes" do
+    must strip_attribute(:name).collapse_spaces
+    must strip_attribute :email
+    wont strip_attribute :password
+  end
+end
+```
+
 **Minitest-Matchers**:
 
 ```ruby
@@ -221,10 +270,9 @@ form of new unit tests.
 
 ## Credits
 
-The idea was originally triggered by the information at the (now defunct) [Rails
-Wiki](http://oldwiki.rubyonrails.org/rails/pages/HowToStripWhitespaceFromModelFields)
-but was modified from the original to include more idiomatic ruby and rails
-support.
+The idea was originally triggered by the information at the (now defunct)
+Rails Wiki but was modified from the original to include more idiomatic ruby
+and rails support.
 
 ## Versioning
 

data/Rakefile

@@ -0,0 +1,11 @@
+require "rake/testtask"
+require "bundler/gem_tasks"
+require "bundler/setup"
+
+desc "Default: run unit tests."
+task :default => :test
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "lib" << "test"
+  t.pattern = "test/**/*_test.rb"
+end

data/lib/strip_attributes.rb

@@ -20,7 +20,22 @@ end
 
 module StripAttributes
   VALID_OPTIONS = [:only, :except, :allow_empty, :collapse_spaces, :replace_newlines, :regex]
-  MULTIBYTE_SUPPORTED = "\u0020" == " "
+
+  # 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
+  # of a string:
+  #   U+180E MONGOLIAN VOWEL SEPARATOR
+  #   U+200B ZERO WIDTH SPACE
+  #   U+200C ZERO WIDTH NON-JOINER
+  #   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" == " "
 
   def self.strip(record_or_string, options = nil)
     if record_or_string.respond_to?(:attributes)
@@ -55,35 +70,25 @@ module StripAttributes
     end
 
     if regex && value.respond_to?(:gsub!)
-      value.gsub!(regex, '')
+      value.gsub!(regex, "")
     end
 
-    if MULTIBYTE_SUPPORTED
-      # Remove leading and trailing 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 of a string:
-      #   U+180E MONGOLIAN VOWEL SEPARATOR
-      #   U+200B ZERO WIDTH SPACE
-      #   U+200C ZERO WIDTH NON-JOINER
-      #   U+200D ZERO WIDTH JOINER
-      #   U+2060 WORD JOINER
-      #   U+FEFF ZERO WIDTH NO-BREAK SPACE
-      regex = /\A[[:space:]\u180E\u200B\u200C\u200D\u2060\uFEFF]+|[[:space:]\u180E\u200B\u200C\u200D\u2060\uFEFF]+\z/
-      if value.respond_to?(:gsub!) && Encoding.compatible?(value, regex)
-        value.gsub!(regex, '')
-      end
+    if MULTIBYTE_SUPPORTED && value.respond_to?(:gsub!) && Encoding.compatible?(value, MULTIBYTE_SPACE)
+      value.gsub!(/\A#{MULTIBYTE_SPACE}+|#{MULTIBYTE_SPACE}+\z/, "")
     elsif value.respond_to?(:strip!)
       value.strip!
     end
 
     if replace_newlines && value.respond_to?(:gsub!)
-      value.gsub!(/[\r\n]+/, ' ')
+      value.gsub!(/[\r\n]+/, " ")
     end
 
-    if collapse_spaces && value.respond_to?(:squeeze!)
-      value.squeeze!(' ')
+    if collapse_spaces
+      if MULTIBYTE_SUPPORTED && value.respond_to?(:gsub!) && Encoding.compatible?(value, MULTIBYTE_BLANK)
+        value.gsub!(/#{MULTIBYTE_BLANK}+/, " ")
+      elsif value.respond_to?(:squeeze!)
+        value.squeeze!(" ")
+      end
     end
 
     value

data/lib/strip_attributes/version.rb

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

data/test/matchers_test.rb

@@ -1,4 +1,8 @@
-require "minitest/matchers"
+begin
+  require "minitest/matchers_vaccine"
+rescue LoadError
+  require "minitest/matchers"
+end
 require "test_helper"
 require "strip_attributes/matchers"
 
@@ -21,15 +25,37 @@ describe SampleMockRecord do
 
   subject { SampleMockRecord.new }
 
-  must { strip_attribute :stripped1 }
-  must { strip_attribute :stripped2 }
-  must { strip_attribute :stripped3 }
-  wont { strip_attribute :unstripped1 }
-  wont { strip_attribute :unstripped2 }
-  wont { strip_attribute :unstripped3 }
+  if defined? Minitest::MatchersVaccine
+    it "should strip strippable attributes" do
+      must strip_attribute :stripped1
+      must strip_attribute :stripped2
+      must strip_attribute :stripped3
+    end
 
-  must { strip_attribute(:collapsed).collapse_spaces }
-  wont { strip_attribute(:uncollapsed).collapse_spaces }
+    it "should not strip other attributes" do
+      wont strip_attribute :unstripped1
+      wont strip_attribute :unstripped2
+      wont strip_attribute :unstripped3
+    end
+
+    it "should collapse collapsible attributes" do
+      must strip_attribute(:collapsed).collapse_spaces
+    end
+
+    it "should not collapse other attributes" do
+      wont strip_attribute(:uncollapsed).collapse_spaces
+    end
+  else
+      must { strip_attribute :stripped1 }
+      must { strip_attribute :stripped2 }
+      must { strip_attribute :stripped3 }
+      wont { strip_attribute :unstripped1 }
+      wont { strip_attribute :unstripped2 }
+      wont { strip_attribute :unstripped3 }
+
+      must { strip_attribute(:collapsed).collapse_spaces }
+      wont { strip_attribute(:uncollapsed).collapse_spaces }
+  end
 
   it "should fail when testing for strip on an unstripped attribute" do
     begin

data/test/strip_attributes_test.rb

@@ -74,7 +74,15 @@ 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" }
+    @init_params = {
+      :foo  => "\tfoo",
+      :bar  => "bar \t ",
+      :biz  => "\tbiz ",
+      :baz  => "",
+      :bang => " ",
+      :foz  => " foz  foz",
+      :fiz  => "fiz \n  fiz"
+    }
   end
 
   def test_should_exist
@@ -227,11 +235,9 @@ class StripAttributesTest < Minitest::Test
   end
 
   def test_should_strip_unicode
-    # This feature only works if multi-byte characters are supported by Ruby
-    return if "\u0020" != " "
-    # U200A - HAIR SPACE
-    # U200B - ZERO WIDTH SPACE
-    record = StripOnlyOneMockRecord.new({:foo => "\u200A\u200B foo\u200A\u200B "})
+    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.valid?
     assert_equal "foo",      record.foo
   end
@@ -252,6 +258,10 @@ class StripAttributesTest < Minitest::Test
       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)
+    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)
@@ -263,11 +273,7 @@ class StripAttributesTest < Minitest::Test
     end
 
     def test_should_strip_unicode
-      # This feature only works if multi-byte characters are supported by Ruby
-      return if "\u0020" != " "
-      # U200A - HAIR SPACE
-      # U200B - ZERO WIDTH SPACE
-      # U20AC - EURO SIGN
+      skip "multi-byte characters not supported by this version of Ruby" unless StripAttributes::MULTIBYTE_SUPPORTED
 
       assert_equal "foo", StripAttributes.strip("\u200A\u200B foo\u200A\u200B ")
       assert_equal "foo\u20AC".force_encoding("ASCII-8BIT"), StripAttributes.strip("foo\u20AC ".force_encoding("ASCII-8BIT"))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strip_attributes
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2016-06-02 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: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,42 +29,28 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: minitest-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -74,10 +60,24 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-matchers_vaccine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -96,16 +96,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '0'
 description: StripAttributes automatically strips all ActiveRecord model attributes
   of leading and trailing whitespace before validation. If the attribute is blank,
   it strips the value to nil.
@@ -115,7 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
 - README.md
+- Rakefile
 - lib/strip_attributes.rb
 - lib/strip_attributes/matchers.rb
 - lib/strip_attributes/shoulda.rb
@@ -144,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Whitespace cleanup for ActiveModel attributes