auto_strip_attributes 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 48197936732130b189671f33be5dd01d1b81330c
-  data.tar.gz: ce19242658ff02bbceaf8526879a6ada25ab5b7a
+SHA256:
+  metadata.gz: caf66b63e636244d95515113c583385ec94ab1daa42bd79305a49b573b5e2b07
+  data.tar.gz: ed94dfab3e498829c13d8e017c0527ea7ce1dc1df9920b7addaeb41ef8fba3f3
 SHA512:
-  metadata.gz: 420d3331984a65b6a4b5caf91fec7986ed3152408e84b0fd256602030dad8ed74be928a1efe448b4ac985bbcd073eb69c7f5b8925322204c9e0135f50a8d3206
-  data.tar.gz: d5cd9d48fa2aec7dad753a1cca1158003bab2d0b8c88ac114a87577017445346be8ae7fced6cadf476f98150f033f8625c6f27eba5b4ffaf8f975bd5ec385af7
+  metadata.gz: fa25b08795e57b2aea579998f814f2c9d630ad529b0caa8e3672e784d87f4a1d6f6358b8eb31d9aef8c79af1917573f46f6e3a33c3b5d8a32bba92bb4c981015
+  data.tar.gz: 8d9f2a5f2cd96a8099cfb67ae68291ec93c22013693899dae525471408626ff5f741c1170e7a1c3666f0405a22915f5e8f6dad6bc3ee00c3887d1aff8cba6732

data/.travis.yml

@@ -2,13 +2,12 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.2.9
-  - 2.3.1
-  - 2.4.4
   - 2.5.1
+  - 2.6.0  
+  - 2.7.0
 env:
-  - "RAILS_VERSION=4.2"
   - "RAILS_VERSION=5.0"
   - "RAILS_VERSION=5.1"
   - "RAILS_VERSION=5.2"
+  - "RAILS_VERSION=6.0"  
 

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 ## [Master]
 
+## [2.6]
+
+  - Support for `array` attributes (thnks to [@sharshenov](https://github.com/holli/auto_strip_attributes/pull/29))
+
 ## [2.5]
 
-  - Support for callback options (e.g. if: -> ...) (thnks to [watsonjon](https://github.com/holli/auto_strip_attributes/pull/28)
+  - Support for callback options (e.g. if: -> ...) (thnks to [@watsonjon#28](https://github.com/holli/auto_strip_attributes/pull/28))
 
 ## [2.4]
 

data/README.md

@@ -7,18 +7,20 @@ It works by adding a before_validation hook to the record. No other methods are
 
 Gem has option to set empty strings to nil or to remove extra spaces inside the string.
 
-[<img src="https://secure.travis-ci.org/holli/auto_strip_attributes.png" />](http://travis-ci.org/holli/auto_strip_attributes)
-[![Gem](https://img.shields.io/gem/dt/auto_strip_attributes.svg?maxAge=2592000)](https://rubygems.org/gems/auto_strip_attributes/)
-[![Gem](https://img.shields.io/gem/v/auto_strip_attributes.svg?maxAge=2592000)](https://rubygems.org/gems/auto_strip_attributes/)
+[![Build Status](https://travis-ci.org/holli/auto_strip_attributes.svg?branch=master)](https://travis-ci.org/holli/auto_strip_attributes)
+[![Downloads](https://img.shields.io/gem/dt/auto_strip_attributes)](https://rubygems.org/gems/auto_strip_attributes/)
+[![Gem](https://img.shields.io/gem/v/auto_strip_attributes)](https://rubygems.org/gems/auto_strip_attributes/)
 
 ## Howto / examples
 
 Include gem in your Gemfile:
 
 ```ruby
-gem "auto_strip_attributes", "~> 2.4"
+gem "auto_strip_attributes", "~> 2.6"
 ```
 
+Example ActiveRecord usage: 
+
 ```ruby
 class User < ActiveRecord::Base
 
@@ -31,11 +33,37 @@ class User < ActiveRecord::Base
   # Won't set to null even if string is blank. "   " => ""
   auto_strip_attributes :email, nullify: false
 
+  # Won't set to null even if array is blank. ["   "] => []
+  auto_strip_attributes :tags, nullify_array: false
+
   # Use with attributes that are not mapped to a column
   auto_strip_attributes :password, virtual: true
 end
 ```
 
+Example ActiveModel usage:
+
+```ruby
+class VirtualUser
+  include ActiveModel::Validations
+  include ActiveModel::Validations::Callbacks
+
+  extend AutoStripAttributes
+
+  attr_accessor :email
+
+  # Use the `virtual` option because attributes are not mapped to a column
+  auto_strip_attributes :email, virtual: true
+end
+
+virtual_user = VirtualUser.new
+virtual_user.email = " alice@example.com "
+
+virtual_user.validate
+virtual_user.email #=> "alice@example.com"
+
+```
+
 # Options
 ### Default options
 
@@ -43,6 +71,7 @@ By default the following options are defined (listed in the order of processing)
 
 - `:strip` (enabled by default) - removes whitespaces from the beginning and the end of string. Works exactly same as `String#strip`, i.e., may not strip non-ASCII whitespaces.
 - `:nullify` (enabled by default) - replaces empty strings with nil.
+- `:nullify_array` (enabled by default) - replaces empty arrays with nil.
 - `:squish` (disabled by default) - replaces all consecutive Unicode whitespace characters (including tabs and new lines) with single space (U+0020). Works exactly same as Rails `String#squish`
 - `:delete_whitespaces` (disabled by default) - deletes all spaces (U+0020) and tabs (U+0009).
 - `:convert_non_breaking_spaces` (disabled by default) - converts non-breaking spaces (U+00A0) to normal spaces (U+0020).
@@ -105,9 +134,7 @@ AutoStripAttributes::Config.setup accepts following options
 
 Gem has been tested with newest Ruby & Rails combination and it probably works also with older versions. See test matrix at https://github.com/holli/auto_strip_attributes/blob/master/.travis.yml
 
-[<img src="https://secure.travis-ci.org/holli/auto_strip_attributes.png" />](http://travis-ci.org/holli/auto_strip_attributes)
-
-http://travis-ci.org/#!/holli/auto_strip_attributes
+[![Build Status](https://travis-ci.org/holli/auto_strip_attributes.svg?branch=master)](https://travis-ci.org/holli/auto_strip_attributes)
 
 # Support
 

data/lib/auto_strip_attributes.rb

@@ -20,7 +20,13 @@ module AutoStripAttributes
         end
         AutoStripAttributes::Config.filters_order.each do |filter_name|
           next if !options[filter_name]
-          value = AutoStripAttributes::Config.filters[filter_name].call(value, options[filter_name])
+          filter = lambda { |original| AutoStripAttributes::Config.filters[filter_name].call(original, options[filter_name]) }
+          value = if value.respond_to?(:is_a?) && value.is_a?(Array)
+            array = value.map { |item| filter.call(item) }.compact
+            options[:nullify_array] && array.empty? ? nil : array
+          else
+            filter.call(value)
+          end
           if virtual
             record.public_send("#{attribute}=", value)
           else
@@ -59,6 +65,7 @@ class AutoStripAttributes::Config
         # Basically same as value.blank? ? nil : value
         (value.respond_to?(:'blank?') and value.respond_to?(:'empty?') and value.blank?) ? nil : value
       end
+      set_filter(nullify_array: true) {|value| value}
       set_filter(squish: false) do |value|
         value = value.respond_to?(:gsub) ? value.gsub(/[[:space:]]+/, ' ') : value
         value.respond_to?(:strip) ? value.strip : value

data/lib/auto_strip_attributes/version.rb

@@ -1,3 +1,3 @@
 module AutoStripAttributes
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

data/test/auto_strip_attributes_test.rb

@@ -83,6 +83,13 @@ describe AutoStripAttributes do
       @record.foo.must_equal "aaa"
     end
 
+    it "should be ok for strings arrays" do
+      @record = MockRecordBasic.new()
+      @record.foo = [" aaa \t", " "]
+      @record.valid?
+      @record.foo.must_equal ["aaa"]
+    end
+
     it "should not delete non breaking spaces" do
       @record = MockRecordBasic.new()
       @record.foo = " aaa \t\u00A0"
@@ -105,6 +112,13 @@ describe AutoStripAttributes do
       @record.foo.must_be_nil
     end
 
+    it "should set empty strings arrays to nil" do
+      @record = MockRecordBasic.new()
+      @record.foo = [" "]
+      @record.valid?
+      @record.foo.must_be_nil
+    end
+
     it "should call strip method to attribute if possible" do
       @record = MockRecordBasic.new()
       str_mock = "  strippable_str  "
@@ -169,6 +183,29 @@ describe AutoStripAttributes do
       @record.valid?
       @record.foo.must_equal ""
     end
+
+    it "should not set blank strings arrays to nil" do
+      @record = MockRecordWithNullify.new()
+      @record.foo = [" "]
+      @record.valid?
+      @record.foo.must_equal [""]
+    end
+  end
+
+  describe "Attribute with nullify_array option" do
+    #class MockRecordWithNullifyArray < ActiveRecord::Base
+    class MockRecordWithNullifyArray < MockRecordParent
+      #column :foo, :string
+      attr_accessor :foo
+      auto_strip_attributes :foo, nullify_array: false
+    end
+
+    it "should not set blank strings array to nil" do
+      @record = MockRecordWithNullifyArray.new
+      @record.foo = ["  "]
+      @record.valid?
+      @record.foo.must_equal []
+    end
   end
 
   describe "Attribute with squish option" do
@@ -212,22 +249,31 @@ describe AutoStripAttributes do
     class MockRecordWithMultipleAttributes < MockRecordParent #< ActiveRecord::Base
       #column :foo, :string
       #column :bar, :string
-      #column :biz, :string
-      #column :bang, :integer
-      attr_accessor :foo, :bar, :biz, :bang
-      auto_strip_attributes :foo, :bar
-      auto_strip_attributes :biz, {nullify: false, squish: true}
+      #column :baz, :string
+      #column :qux, :string, array: true
+      #column :quux, :string, array: true
+      #column :quuz, :string, array: true
+      attr_accessor :foo, :bar, :baz, :qux, :quux, :quuz
+      auto_strip_attributes :foo, :bar, :qux
+      auto_strip_attributes :baz, :quux, {nullify: false, squish: true}
+      auto_strip_attributes :quuz, {nullify: true, nullify_array: false}
     end
 
     it "should handle everything ok" do
       @record = MockRecordWithMultipleAttributes.new
       @record.foo = "  foo\tfoo"
       @record.bar = "  "
-      @record.biz = "  "
+      @record.baz = "  "
+      @record.qux = ["\n"]
+      @record.quux = ["  foo\tfoo", "  "]
+      @record.quuz = [" "]
       @record.valid?
       @record.foo.must_equal "foo\tfoo"
       @record.bar.must_be_nil
-      @record.biz.must_equal ""
+      @record.baz.must_equal ""
+      @record.qux.must_be_nil
+      @record.quux.must_equal ["foo foo", ""]
+      @record.quuz.must_equal []
     end
   end
 
@@ -284,7 +330,7 @@ describe AutoStripAttributes do
     it "should have default filters set in right order" do
       AutoStripAttributes::Config.setup(clear_previous: true)
       filters_order = AutoStripAttributes::Config.filters_order
-      filters_order.must_equal [:convert_non_breaking_spaces, :strip, :nullify, :squish, :delete_whitespaces]
+      filters_order.must_equal [:convert_non_breaking_spaces, :strip, :nullify, :nullify_array, :squish, :delete_whitespaces]
     end
 
     it "should reset filters to defaults when :clear is true" do
@@ -295,7 +341,7 @@ describe AutoStripAttributes do
       end
       AutoStripAttributes::Config.setup(clear_previous: true)
       filters_order = AutoStripAttributes::Config.filters_order
-      filters_order.must_equal [:convert_non_breaking_spaces, :strip, :nullify, :squish, :delete_whitespaces]
+      filters_order.must_equal [:convert_non_breaking_spaces, :strip, :nullify, :nullify_array, :squish, :delete_whitespaces]
     end
 
     it "should remove all filters when :clear is true and :defaults is false" do
@@ -328,7 +374,7 @@ describe AutoStripAttributes do
       filters_order = AutoStripAttributes::Config.filters_order
       filters_enabled = AutoStripAttributes::Config.filters_enabled
 
-      filters_order.must_equal [:convert_non_breaking_spaces, :strip, :nullify, :squish, :delete_whitespaces, :test]
+      filters_order.must_equal [:convert_non_breaking_spaces, :strip, :nullify, :nullify_array, :squish, :delete_whitespaces, :test]
       assert Proc === filters_block[:test]
       filters_enabled[:test].must_equal true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auto_strip_attributes
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Olli Huotari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: auto_strip_attributes
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Removes unnecessary whitespaces in attributes. Extension to ActiveRecord