valid_attribute 0.0.3 → 0.0.4

data/HISTORY

@@ -1,3 +1,6 @@
+== 0.0.4
+  fix for multiple should_not values
+
 == 0.0.3
   should_not fix for when the validation key doesn't exist yet
   removed .message method. Not good BDD

data/lib/valid_attribute/version.rb

@@ -1,3 +1,3 @@
 module ValidAttribute
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/valid_attribute.rb

@@ -19,9 +19,7 @@ module ValidAttribute
     attr_accessor :attr, :values, :subject, :failed_values, :passed_values
 
     def initialize(attr)
-      self.attr          = attr
-      self.failed_values = []
-      self.passed_values = []
+      self.attr = attr
     end
 
     def when(*values)
@@ -46,11 +44,25 @@ module ValidAttribute
     end
 
     def matches?(subject)
+      check_values(subject)
+      failed_values.empty?
+    end
+
+    def does_not_match?(subject)
+      check_values(subject)
+      passed_values.empty?
+    end
+
+    private
+
+    def check_values(subject)
       unless values
         raise ::ValidAttribute::NoValues, "you need to set the values with .when on the matcher (ex. it { should have_valid(:name).when('Brian') })"
       end
 
-      self.subject = subject
+      self.subject       = subject
+      self.failed_values = []
+      self.passed_values = []
 
       values.each do |value|
         subject.send("#{attr}=", value)
@@ -61,12 +73,8 @@ module ValidAttribute
           self.passed_values << value
         end
       end
-
-      failed_values.empty?
     end
 
-    private
-
     def quote_values(values)
       values.map { |value| value.is_a?(String) ? "'#{value}'" : value }.join(', ')
     end

data/spec/valid_attribute_spec.rb

@@ -37,14 +37,19 @@ describe 'ValidAttribute' do
 
   describe 'data is first invalid then invalid' do
     before do
-      @user.stubs(:valid?).returns(false).then.returns(true).then.returns(false)
-      @user.stubs(:errors).returns({:name => []}).then.returns({})
-      @matcher = @should.have_valid(:name).when('abc', 123)
-      @result  = @matcher.matches?(@user)
+      @user.stubs(:valid?).returns(false).then.returns(true).then.returns(false).then.returns(true)
+      @user.stubs(:errors).returns({:name => []}).then.returns({}).then.returns({:name => []}).then.returns({})
+      @matcher        = @should.have_valid(:name).when('abc', 123)
+      @matches        = @matcher.matches?(@user)
+      @does_not_match = @matcher.does_not_match?(@user)
+    end
+
+    it 'matches? returns false' do
+      @matches.should be_false
     end
 
-    it 'returns false' do
-      @result.should be_false
+    it 'does_not_match? returns false' do
+      @does_not_match.should be_false
     end
 
     it 'has a failure message of the failed values' do
@@ -58,14 +63,19 @@ describe 'ValidAttribute' do
 
   describe 'data is first invalid then valid then invalid then valid' do
     before do
-      @user.stubs(:valid?).returns(false).then.returns(true).then.returns(false)
-      @user.stubs(:errors).returns({:name => []}).then.returns({}).then.returns({:name => []}).then.returns({})
-      @matcher = @should.have_valid(:name).when('abc', 123, 456, 'def')
-      @result  = @matcher.matches?(@user)
+      @user.stubs(:valid?).returns(false).then.returns(true).then.returns(false).then.returns(false).then.returns(true).then.returns(false)
+      @user.stubs(:errors).returns({:name => []}).then.returns({}).then.returns({:name => []}).then.returns({}).then.returns({:name => []}).then.returns({}).then.returns({:name => []}).then.returns({})
+      @matcher        = @should.have_valid(:name).when('abc', 123, 456, 'def')
+      @matches        = @matcher.matches?(@user)
+      @does_not_match = @matcher.does_not_match?(@user)
+    end
+
+    it 'matches? returns false' do
+      @matches.should be_false
     end
 
-    it 'returns false' do
-      @result.should be_false
+    it 'does_not_match? returns true' do
+      @does_not_match.should be_false
     end
 
     it 'has a failure message of the failed values' do

metadata

@@ -2,7 +2,7 @@
 name: valid_attribute
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -04:00
+date: 2011-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency