strip_attributes 1.4.2 → 1.4.3

data/README.md

@@ -134,7 +134,7 @@ end
 
 ```ruby
 describe User do
-  it { should strip_attribute :name }
+  it { should strip_attribute(:name).collapse_spaces }
   it { should strip_attribute :email }
   it { should_not strip_attribute :password }
 end
@@ -144,7 +144,7 @@ end
 
 ```ruby
 class UserTest < ActiveSupport::TestCase
-  should strip_attribute :name
+  should strip_attribute(:name).collapse_spaces
   should strip_attribute :email
   should_not strip_attribute :password
 end
@@ -156,7 +156,7 @@ end
 describe User do
   subject { User.new }
 
-  must { strip_attribute :name }
+  must { strip_attribute(:name).collapse_spaces }
   must { strip_attribute :email }
   wont { strip_attribute :password }
 end

data/lib/strip_attributes/matchers.rb

@@ -19,26 +19,48 @@ module StripAttributes
     class StripAttributeMatcher
       def initialize(attribute)
         @attribute = attribute
+        @options = {}
       end
 
       def matches?(subject)
         subject.send("#{@attribute}=", " string ")
         subject.valid?
-        subject.send(@attribute) == "string"
+        subject.send(@attribute) == "string" and collapse_spaces?(subject)
       end
 
-      def failure_message
-        "Expected whitespace to be stripped from `#{@attribute}`, but it was not"
+      def collapse_spaces
+        @options[:collapse_spaces] = true
+        self
       end
 
-      def negative_failure_message
-        "Expected whitespace to remain on `#{@attribute}`, but it was stripped"
+      def failure_message_for_should
+        "Expected whitespace to be #{expectation} from ##{@attribute}, but it was not"
       end
+      alias_method :failure_message, :failure_message_for_should
+
+      def failure_message_for_should_not
+        "Expected whitespace to remain on ##{@attribute}, but it was #{expectation}"
+      end
+      alias_method :negative_failure_message, :failure_message_for_should_not
 
       def description
-        "strip whitespace from ##{@attribute}"
+        "#{expectation(false)} whitespace from ##{@attribute}"
       end
-    end
 
+      private
+
+      def collapse_spaces?(subject)
+        return true if !@options[:collapse_spaces]
+
+        subject.send("#{@attribute}=", " string    string ")
+        subject.valid?
+        subject.send(@attribute) == "string string"
+      end
+
+      def expectation(past = true)
+        expectation = past ? "stripped" : "strip"
+        expectation += past ? " and collapsed" : " and collapse" if @options[:collapse_spaces]
+      end
+    end
   end
 end

data/lib/strip_attributes/version.rb

@@ -1,3 +1,3 @@
 module StripAttributes
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/test/matchers_test.rb

@@ -10,6 +10,10 @@ class SampleMockRecord < Tableless
   attribute :unstripped2
   attribute :unstripped3
   strip_attributes :only => [:stripped1, :stripped2, :stripped3]
+
+  attribute :collapsed
+  attribute :uncollapsed
+  strip_attributes :only => [:collapsed], :collapse_spaces => true
 end
 
 describe SampleMockRecord do
@@ -24,6 +28,9 @@ describe SampleMockRecord do
   wont { strip_attribute :unstripped2 }
   wont { strip_attribute :unstripped3 }
 
+  must { strip_attribute(:collapsed).collapse_spaces }
+  wont { strip_attribute(:uncollapsed).collapse_spaces }
+
   it "should fail when testing for strip on an unstripped attribute" do
     begin
       assert_must strip_attribute(:unstripped1)
@@ -41,4 +48,22 @@ describe SampleMockRecord do
       assert true
     end
   end
+
+  it "should fail when testing for collapse on an uncollapsed attribute" do
+    begin
+      assert_must collapse_attribute(:uncollapsed)
+      assert false
+    rescue
+      assert true
+    end
+  end
+
+  it "should fail when testing for no collapse on a collapsed attribute" do
+    begin
+      assert_wont collapse_attribute(:collapsed)
+      assert false
+    rescue
+      assert true
+    end
+  end
 end

metadata

@@ -2,14 +2,14 @@
 name: strip_attributes
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4359305486142774400
+      hash: -2985851846884596940
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4359305486142774400
+      hash: -2985851846884596940
       version: '0'
   none: false
 requirements: []