strip_attributes 1.2.0 → 1.3.0

data/README.md

@@ -2,7 +2,7 @@
 
 StripAttributes is an ActiveModel extension that automatically strips all
 attributes of leading and trailing whitespace before validation. If the
-attribute is blank, it strips the value to `nil`.
+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`
@@ -46,6 +46,15 @@ class ConservativePokerPlayer < ActiveRecord::Base
 end
 ```
 
+### Using `allow_empty`
+
+```ruby
+# Empty attributes will not be converted to nil
+class BrokePokerPlayer < ActiveRecord::Base
+  strip_attributes :allow_empty => true
+end
+```
+
 ## Usage Patterns
 
 ### Other ORMs implementing `ActiveModel`
@@ -97,7 +106,6 @@ To initialize **Shoulda (with test-unit)**, add this to your `test_helper.rb`:
 ```ruby
 require "strip_attributes/matchers"
 class Test::Unit::TestCase
-  include StripAttributes::Matchers
   extend StripAttributes::Matchers
 end
 ```

data/lib/strip_attributes/version.rb

@@ -1,3 +1,3 @@
 module StripAttributes
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/strip_attributes.rb

@@ -4,10 +4,12 @@ module ActiveModel::Validations::HelperMethods
   # Strips whitespace from model fields and converts blank values to nil.
   def strip_attributes(options = nil)
     before_validation do |record|
+      allow_empty = options.delete(:allow_empty) if options
+
       attributes = StripAttributes.narrow(record.attributes, options)
       attributes.each do |attr, value|
         if value.respond_to?(:strip)
-          record[attr] = (value.blank?) ? nil : value.strip
+          record[attr] = (value.blank? && !allow_empty) ? nil : value.strip
         end
       end
     end
@@ -25,7 +27,7 @@ module StripAttributes
   # Necessary because Rails has removed the narrowing of attributes using :only
   # and :except on Base#attributes
   def self.narrow(attributes, options)
-    if options.nil?
+    if options.nil? || options.empty?
       attributes
     else
       if except = options[:except]

data/test/strip_attributes_test.rb

@@ -31,6 +31,12 @@ class StripExceptThreeMockRecord < Tableless
   strip_attributes :except => [:foo, :bar, :biz]
 end
 
+class StripAllowEmpty < Tableless
+  include MockAttributes
+  strip_attributes :allow_empty => true
+end
+
+
 class StripAttributesTest < MiniTest::Unit::TestCase
   def setup
     @init_params = { :foo => "\tfoo", :bar => "bar \t ", :biz => "\tbiz ", :baz => "", :bang => " " }
@@ -89,4 +95,14 @@ class StripAttributesTest < MiniTest::Unit::TestCase
     assert_nil record.baz
     assert_nil record.bang
   end
+
+  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 "",    record.baz
+    assert_equal "",    record.bang
+  end
 end

metadata

@@ -2,14 +2,14 @@
 name: strip_attributes
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4383093810651620729
+      hash: -2456424087513438655
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4383093810651620729
+      hash: -2456424087513438655
       version: '0'
 requirements: []
 rubyforge_project: