strip_attributes 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed934987322fa0c7a338d28649edd88a8520bf38
-  data.tar.gz: 2e1d75c6c7c5cb6b22e902cf3a80ebd22c5cf1aa
+  metadata.gz: 6618accc8ca40df61327ca55b7791a33044db8ea
+  data.tar.gz: 1640362c209a8d7cfd674f43e3d622dcd1ca7682
 SHA512:
-  metadata.gz: 061fb3c3a5325750dc31a3e3c501a04c8d8da8dcb9516a2f76660ce5af1d920b0113ccf873f65065fa1be4242ab54f43432d3065b4d1b06482090ab8ea8b3764
-  data.tar.gz: 48a502af83d76d0e48b0e81e00aad261e50c46b31c265cc04d6d00d31a62da8a4a15371e423ef7b52eaa22497a126afad11bebab42c389851a163df12b52d744
+  metadata.gz: f185c24787def356267ba2fd9ecef1d74384fd43e679d3a3c204bd6fd540bde5b91421a8e7521137161181fa70f54e2486f96c0775e76f228f5b9dd4d22f0269
+  data.tar.gz: 6427387dac7327755d5f3035ae99ff85f985e8cefeff155836c298954189686644bee586026aa9b9638a61e84b7ae830c9f42ddb9b5e60a336276eacdbd1cae3

data/README.md

@@ -85,6 +85,15 @@ class EloquentPokerPlayer < ActiveRecord::Base
 end
 ```
 
+### Using `replace_newlines`
+
+```ruby
+# Newlines in attributes will be replaced with a space
+class EloquentPokerPlayer < ActiveRecord::Base
+  strip_attributes :replace_newlines => true
+end
+```
+
 ### Using `regex`
 
 ```ruby
@@ -129,7 +138,7 @@ end
 ### Using it directly
 
 ```ruby
-# where record is an ActiveModel isntance
+# where record is an ActiveModel instance
 StripAttributes.strip(record, :collapse_spaces => true)
 
 # works directly on Strings too

data/lib/strip_attributes.rb

@@ -19,7 +19,7 @@ module ActiveModel::Validations::HelperMethods
 end
 
 module StripAttributes
-  VALID_OPTIONS = [:only, :except, :allow_empty, :collapse_spaces, :regex]
+  VALID_OPTIONS = [:only, :except, :allow_empty, :collapse_spaces, :replace_newlines, :regex]
   MULTIBYTE_SUPPORTED = "\u0020" == " "
 
   def self.strip(record_or_string, options = nil)
@@ -44,9 +44,10 @@ module StripAttributes
 
   def self.strip_string(value, options = nil)
     if options
-      allow_empty     = options[:allow_empty]
-      collapse_spaces = options[:collapse_spaces]
-      regex           = options[:regex]
+      allow_empty      = options[:allow_empty]
+      collapse_spaces  = options[:collapse_spaces]
+      replace_newlines = options[:replace_newlines]
+      regex            = options[:regex]
     end
 
     if value.respond_to?(:strip)
@@ -76,6 +77,10 @@ module StripAttributes
       value.strip!
     end
 
+    if replace_newlines && value.respond_to?(:gsub!)
+      value.gsub!(/[\r\n]+/, ' ')
+    end
+
     if collapse_spaces && value.respond_to?(:squeeze!)
       value.squeeze!(' ')
     end

data/lib/strip_attributes/version.rb

@@ -1,3 +1,3 @@
 module StripAttributes
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/test/strip_attributes_test.rb

@@ -8,6 +8,7 @@ module MockAttributes
     base.attribute :baz
     base.attribute :bang
     base.attribute :foz
+    base.attribute :fiz
   end
 end
 
@@ -46,6 +47,16 @@ class CollapseDuplicateSpaces < Tableless
   strip_attributes :collapse_spaces => true
 end
 
+class ReplaceNewLines < Tableless
+  include MockAttributes
+  strip_attributes :replace_newlines => true
+end
+
+class ReplaceNewLinesAndDuplicateSpaces < Tableless
+  include MockAttributes
+  strip_attributes :replace_newlines => true, :collapse_spaces => true
+end
+
 class CoexistWithOtherValidations < Tableless
   attribute :number, :type => Integer
 
@@ -63,7 +74,7 @@ end
 
 class StripAttributesTest < Minitest::Test
   def setup
-    @init_params = { :foo => "\tfoo", :bar => "bar \t ", :biz => "\tbiz ", :baz => "", :bang => " ", :foz => " foz  foz" }
+    @init_params = { :foo => "\tfoo", :bar => "bar \t ", :biz => "\tbiz ", :baz => "", :bang => " ", :foz => " foz  foz", :fiz => "fiz \n  fiz" }
   end
 
   def test_should_exist
@@ -73,10 +84,11 @@ class StripAttributesTest < Minitest::Test
   def test_should_strip_all_fields
     record = StripAllMockRecord.new(@init_params)
     record.valid?
-    assert_equal "foo",      record.foo
-    assert_equal "bar",      record.bar
-    assert_equal "biz",      record.biz
-    assert_equal "foz  foz", record.foz
+    assert_equal "foo",         record.foo
+    assert_equal "bar",         record.bar
+    assert_equal "biz",         record.biz
+    assert_equal "foz  foz",    record.foz
+    assert_equal "fiz \n  fiz", record.fiz
     assert_nil record.baz
     assert_nil record.bang
   end
@@ -84,32 +96,35 @@ class StripAttributesTest < Minitest::Test
   def test_should_strip_only_one_field
     record = StripOnlyOneMockRecord.new(@init_params)
     record.valid?
-    assert_equal "foo",      record.foo
-    assert_equal "bar \t ",  record.bar
-    assert_equal "\tbiz ",   record.biz
-    assert_equal " foz  foz", record.foz
-    assert_equal "",         record.baz
-    assert_equal " ",        record.bang
+    assert_equal "foo",         record.foo
+    assert_equal "bar \t ",     record.bar
+    assert_equal "\tbiz ",      record.biz
+    assert_equal " foz  foz",   record.foz
+    assert_equal "fiz \n  fiz", record.fiz
+    assert_equal "",            record.baz
+    assert_equal " ",           record.bang
   end
 
   def test_should_strip_only_three_fields
     record = StripOnlyThreeMockRecord.new(@init_params)
     record.valid?
-    assert_equal "foo",      record.foo
-    assert_equal "bar",      record.bar
-    assert_equal "biz",      record.biz
-    assert_equal " foz  foz", record.foz
-    assert_equal "",         record.baz
-    assert_equal " ",        record.bang
+    assert_equal "foo",         record.foo
+    assert_equal "bar",         record.bar
+    assert_equal "biz",         record.biz
+    assert_equal " foz  foz",   record.foz
+    assert_equal "fiz \n  fiz", record.fiz
+    assert_equal "",            record.baz
+    assert_equal " ",           record.bang
   end
 
   def test_should_strip_all_except_one_field
     record = StripExceptOneMockRecord.new(@init_params)
     record.valid?
-    assert_equal "\tfoo",    record.foo
-    assert_equal "bar",      record.bar
-    assert_equal "biz",      record.biz
-    assert_equal "foz  foz", record.foz
+    assert_equal "\tfoo",       record.foo
+    assert_equal "bar",         record.bar
+    assert_equal "biz",         record.biz
+    assert_equal "foz  foz",    record.foz
+    assert_equal "fiz \n  fiz", record.fiz
     assert_nil record.baz
     assert_nil record.bang
   end
@@ -117,10 +132,11 @@ class StripAttributesTest < Minitest::Test
   def test_should_strip_all_except_three_fields
     record = StripExceptThreeMockRecord.new(@init_params)
     record.valid?
-    assert_equal "\tfoo",    record.foo
-    assert_equal "bar \t ",  record.bar
-    assert_equal "\tbiz ",   record.biz
-    assert_equal "foz  foz", record.foz
+    assert_equal "\tfoo",       record.foo
+    assert_equal "bar \t ",     record.bar
+    assert_equal "\tbiz ",      record.biz
+    assert_equal "foz  foz",    record.foz
+    assert_equal "fiz \n  fiz", record.fiz
     assert_nil record.baz
     assert_nil record.bang
   end
@@ -128,21 +144,47 @@ class StripAttributesTest < Minitest::Test
   def test_should_strip_and_allow_empty
     record = StripAllowEmpty.new(@init_params)
     record.valid?
-    assert_equal "foo",      record.foo
-    assert_equal "bar",      record.bar
-    assert_equal "biz",      record.biz
-    assert_equal "foz  foz", record.foz
-    assert_equal "",         record.baz
-    assert_equal "",         record.bang
+    assert_equal "foo",         record.foo
+    assert_equal "bar",         record.bar
+    assert_equal "biz",         record.biz
+    assert_equal "foz  foz",    record.foz
+    assert_equal "fiz \n  fiz", record.fiz
+    assert_equal "",            record.baz
+    assert_equal "",            record.bang
   end
 
   def test_should_collapse_duplicate_spaces
     record = CollapseDuplicateSpaces.new(@init_params)
     record.valid?
+    assert_equal "foo",        record.foo
+    assert_equal "bar",        record.bar
+    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
+  end
+
+  def test_should_replace_newlines
+    record = ReplaceNewLines.new(@init_params)
+    record.valid?
+    assert_equal "foo",        record.foo
+    assert_equal "bar",        record.bar
+    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
+  end
+
+  def test_should_replace_newlines_and_duplicate_spaces
+    record = ReplaceNewLinesAndDuplicateSpaces.new(@init_params)
+    record.valid?
     assert_equal "foo",     record.foo
     assert_equal "bar",     record.bar
     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
   end
@@ -152,12 +194,13 @@ class StripAttributesTest < Minitest::Test
     record.valid?
     record.assign_attributes(@init_params)
     record.valid?
-    assert_equal "foo",      record.foo
-    assert_equal "bar",      record.bar
-    assert_equal "biz",      record.biz
-    assert_equal "foz  foz", record.foz
-    assert_equal "",         record.baz
-    assert_equal "",         record.bang
+    assert_equal "foo",         record.foo
+    assert_equal "bar",         record.bar
+    assert_equal "biz",         record.biz
+    assert_equal "foz  foz",    record.foz
+    assert_equal "fiz \n  fiz", record.fiz
+    assert_equal "",            record.baz
+    assert_equal "",            record.bang
   end
 
   def test_should_coexist_with_other_validations
@@ -209,6 +252,12 @@ class StripAttributesTest < Minitest::Test
       assert_equal "1 2 3", StripAttributes.strip(" 1   2   3\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)
+    end
+
     def test_should_strip_regex
       assert_equal "abc", StripAttributes.strip("^%&*abc  ^  ", :regex => /[\^\%&\*]/)
     end

data/test/test_helper.rb

@@ -1,5 +1,11 @@
 require "minitest/autorun"
-require "minitest/pride"
+require "minitest/reporters"
+if ENV["CI"] == "true"
+  Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new
+else
+  Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new
+end
+
 require "active_attr"
 require "strip_attributes"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strip_attributes
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -78,6 +78,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.24
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.24
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement