valid_attribute 0.0.2 → 0.0.3

data/HISTORY

@@ -1,3 +1,8 @@
+== 0.0.3
+  should_not fix for when the validation key doesn't exist yet
+  removed .message method. Not good BDD
+  will test all values instead of stopping at the first invalid value
+
 == 0.0.2
   Removed default value, allways required to pass value
   Changed #with to #when

data/README.markdown

@@ -21,7 +21,7 @@ Instead of having validation specific matchers ValidAttribute only cares if the
 
       attr_accessor :email, :name, :password
 
-      validates :email,    :format => { :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :message => 'invalid email format' }
+      validates :email,    :format => { :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i }
       validates :name,     :length => { :minimum => 5 }
       validates :password, :confirmation => true, :presence => true
     end
@@ -29,7 +29,7 @@ Instead of having validation specific matchers ValidAttribute only cares if the
     describe User do
       # The .when method can take any number of values that you want to pass
       it { should have_valid(:email).when('test@test.com', 'test+spam@gmail.com') }
-      it { should_not have_valid(:email).when('fail', 123).message('invalid email format') }
+      it { should_not have_valid(:email).when('fail', 123) }
       it { should have_valid(:name).when('TestName')
       it { should_not have_valid(:name).when('Test')
 
@@ -46,8 +46,7 @@ Instead of having validation specific matchers ValidAttribute only cares if the
 As long as your model responds to the following methods:
 
 * valid? - only used to generate errors on the model
-* errors - should be a Hash of errors, the keys being the attribute with errors and the value for each key being an array of error messages
-* model_name - used in the failure messages. Class level method
+* errors - should be a collection of attributes that have validation errors.
 
 Other than that everything should work!
 

data/lib/valid_attribute/version.rb

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

data/lib/valid_attribute.rb

@@ -4,8 +4,9 @@ module ValidAttribute
   #
   # examples:
   #  it { should have_valid(:name).when('Brian') }
-  #  it { should_not have_valid(:name).message("can't be blank") }
+  #  it { should_not have_valid(:name).when(nil) }
   #  it { should have_valid(:email).when('test@test.com', 'test+spam@gmail.com') }
+  #  it { should_not have_valid(:email).when('abc', 123) }
   #
   # @param [Symbol]
   #
@@ -15,10 +16,12 @@ module ValidAttribute
   end
 
   class ValidAttributeMatcher
-    attr_accessor :attr, :values, :validation_message, :subject, :failed_value
+    attr_accessor :attr, :values, :subject, :failed_values, :passed_values
 
     def initialize(attr)
-      self.attr   = attr
+      self.attr          = attr
+      self.failed_values = []
+      self.passed_values = []
     end
 
     def when(*values)
@@ -26,30 +29,19 @@ module ValidAttribute
       self
     end
 
-    def message(message)
-      self.validation_message = message
-      self
-    end
-
-    def negative_failure_message
-      failure_message = " expected #{subject.class.model_name}##{attr} to not accept a value of #{value_message}"
-
-      if validation_message
-        failure_message = "#{failure_message} with a message of '#{validation_message}'"
-      end
-
-      failure_message
-    end
-
     def failure_message
-      " expected #{subject.class.model_name}##{attr} to accept a value of #{value_message}"
+      if failed_values.size == 1
+        " expected #{subject.class.model_name}##{attr} to accept the value: #{quote_values(failed_values)}"
+      else
+        " expected #{subject.class.model_name}##{attr} to accept the values: #{quote_values(failed_values)}"
+      end
     end
 
-    def value_message
-      if failed_value.is_a?(String)
-        "'#{failed_value}'"
+    def negative_failure_message
+      if passed_values.size == 1
+        " expected #{subject.class.model_name}##{attr} to not accept the value: #{quote_values(passed_values)}"
       else
-        failed_value
+        " expected #{subject.class.model_name}##{attr} to not accept the values: #{quote_values(passed_values)}"
       end
     end
 
@@ -63,18 +55,20 @@ module ValidAttribute
       values.each do |value|
         subject.send("#{attr}=", value)
         subject.valid?
-
-        if subject.errors.include?(attr)
-          self.failed_value = value
-          if validation_message
-            return !subject.errors[attr].include?(validation_message)
-          else
-            return false
-          end
+        if subject.errors.key?(attr)
+          self.failed_values << value
+        else
+          self.passed_values << value
         end
       end
 
-      true
+      failed_values.empty?
+    end
+
+    private
+
+    def quote_values(values)
+      values.map { |value| value.is_a?(String) ? "'#{value}'" : value }.join(', ')
     end
 
   end

data/spec/valid_attribute_spec.rb

@@ -6,6 +6,7 @@ end
 
 class User
   attr_accessor :name
+  attr_accessor :email
 
   def errors
     @error ||= {}
@@ -28,92 +29,51 @@ describe 'ValidAttribute' do
       @user.stubs(:valid?).returns(true)
     end
 
-    it 'passes with no value set' do
-      matcher = @should.have_valid(:name).when(nil)
-      matcher.matches?(@user).should be_true
-    end
-
-    it 'passes with values set' do
+    it 'passes with values' do
       matcher = @should.have_valid(:name).when('Brian', 'Stephanie')
       matcher.matches?(@user).should be_true
     end
   end
 
-  describe 'invalid data' do
+  describe 'data is first invalid then invalid' do
     before do
-      @user.stubs(:valid?).returns(false)
-      @user.errors[:name] = ['is not valid']
-    end
-
-    it 'returns false when no message passed' do
-      matcher = @should.have_valid(:name).when(nil)
-      matcher.matches?(@user).should be_false
-    end
-
-    it 'returns true when wrong message is passed' do
-      matcher = @should.have_valid(:name).when(nil).message('wrong message')
-      matcher.matches?(@user).should_not be_false
-    end
-
-    it 'returns false when correct message is passed' do
-      matcher = @should.have_valid(:name).when(nil).message('is not valid')
-      matcher.matches?(@user).should be_false
-    end
-  end
-
-  describe 'data is first valid then invalid' do
-    before do
-      @user.stubs(:valid?).returns(true).then.returns(false)
-      @user.errors[:name] = ['is not valid']
+      @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)
     end
 
     it 'returns false' do
-      matcher = @should.have_valid(:name).when('true', 'false')
-      matcher.matches?(@user).should be_false
+      @result.should be_false
     end
-  end
 
-  describe 'failure message' do
-    before do
-      @user.stubs(:valid?).returns(false)
-      @user.errors[:name] = ['is not valid']
+    it 'has a failure message of the failed values' do
+      @matcher.failure_message.should == " expected User#name to accept the value: 'abc'"
     end
 
-    it 'has a message for string values' do
-      matcher = @should.have_valid(:name).when('Brian')
-      matcher.matches?(@user)
-      matcher.failure_message.should == " expected User#name to accept a value of 'Brian'"
-    end
-
-    it 'has a message for non string values' do
-      matcher = @should.have_valid(:name).when(123)
-      matcher.matches?(@user)
-      matcher.failure_message.should == " expected User#name to accept a value of 123"
+    it 'has a negative failure message of the passed values' do
+      @matcher.negative_failure_message.should == " expected User#name to not accept the value: 123"
     end
   end
 
-  describe 'negative failure message' do
+  describe 'data is first invalid then valid then invalid then valid' do
     before do
-      @user.stubs(:valid?).returns(false)
-      @user.errors[:name] = ['is not valid']
+      @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)
     end
 
-    it 'has a message for string values' do
-      matcher = @should.have_valid(:name).when('Brian')
-      matcher.matches?(@user)
-      matcher.negative_failure_message.should == " expected User#name to not accept a value of 'Brian'"
+    it 'returns false' do
+      @result.should be_false
     end
 
-    it 'has a message for non string values' do
-      matcher = @should.have_valid(:name).when(123)
-      matcher.matches?(@user)
-      matcher.negative_failure_message.should == " expected User#name to not accept a value of 123"
+    it 'has a failure message of the failed values' do
+      @matcher.failure_message.should == " expected User#name to accept the values: 'abc', 456"
     end
 
-    it 'includes the validation message' do
-      matcher = @should.have_valid(:name).when('Brian').message('is not valid')
-      matcher.matches?(@user)
-      matcher.negative_failure_message.should == " expected User#name to not accept a value of 'Brian' with a message of 'is not valid'"
+    it 'has a negative failure message of the passed values' do
+      @matcher.negative_failure_message.should == " expected User#name to not accept the values: 123, 'def'"
     end
   end
 

metadata

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