valid_attribute 1.0.0 → 1.1.0

data/HISTORY

@@ -1,3 +1,9 @@
+== 1.1.0
+  #when is not necessary [davisre]
+
+== 1.0.0
+  Gold!
+
 == 0.2.1
   Better value quoting using #inspect
 

data/README.markdown

@@ -11,7 +11,7 @@ Supported ORMs
 
 ## Installation ##
 
-If you're using `RSpec` just add the `valid_attribute` to your `Gemfile`
+If you're using `RSpec` just add the `valid_attribute` to your `Gemfile` AFTER rspec gem.
 
 ```ruby
 gem 'valid_attribute'
@@ -63,10 +63,13 @@ describe User do
     it { should have_valid(:password).when('password') }
     it { should_not have_valid(:password).when(nil) }
   end
+
+  # Using .when is optional. Without it, the existing value is examined.
+  it { should_not have_valid(:email) }
 end
 
 # TestUnit
-require 'should/context'
+require 'shoulda/context'
 class UserTest < Test::Unit::TestCase
   # The .when method can take any number of values that you want to pass
   should have_valid(:email).when('test@test.com', 'test+spam@gmail.com')
@@ -74,12 +77,15 @@ class UserTest < Test::Unit::TestCase
   should have_valid(:name).when('TestName')
   should_not have_valid(:name).when('Test')
 
-  # Because 'shoulda-context' works off the the 'subject' we can set other values if necessary for a given validation test
+  # Because 'shoulda-context' works off the 'subject' we can set other values if necessary for a given validation test
   context 'password' do
     subject { User.new(:password_confirmation => 'password') }
     should have_valid(:password).when('password')
     should_not have_valid(:password).when(nil)
   end
+
+  # Using .when is optional. Without it, the existing value is examined.
+  should_not have_valid(:email)
 end
 ```
 
@@ -106,8 +112,6 @@ class User
 end
 ```
 
-Other than that everything should work!
-
 ## Legal ##
 
 Brian Cardarella &copy; 2011

data/lib/valid_attribute/matcher.rb

@@ -21,9 +21,9 @@ module ValidAttribute
 
     def negative_failure_message
       if passed_values.size == 1
-        " expected #{subject.class}##{attr} to not accept the value: #{quote_values(passed_values)}"
+        " expected #{subject.class}##{attr} to reject the value: #{quote_values(passed_values)}"
       else
-        " expected #{subject.class}##{attr} to not accept the values: #{quote_values(passed_values)}"
+        " expected #{subject.class}##{attr} to reject the values: #{quote_values(passed_values)}"
       end
     end
 
@@ -44,23 +44,35 @@ module ValidAttribute
     private
 
     def check_values(subject)
-      unless values
-        raise ::ValidAttribute::NoValues, "you need to set the values with .when on the matcher. Example: have_valid(:name).when('Brian')"
-      end
-
       self.subject       = subject
       self.failed_values = []
       self.passed_values = []
 
+      if values
+        check_specified_values
+      else
+        check_existing_value
+      end
+    end
+
+    def check_specified_values
       values.each do |value|
-        subject.send("#{attr}=", value)
-        subject.valid?
-
-        if invalid_attribute?(subject, attr)
-          self.failed_values << value
-        else
-          self.passed_values << value
-        end
+        check_value value
+      end
+    end
+
+    def check_existing_value
+      check_value subject.send("#{attr}")
+    end
+
+    def check_value(value)
+      subject.send("#{attr}=", value)
+      subject.valid?
+
+      if invalid_attribute?(subject, attr)
+        self.failed_values << value
+      else
+        self.passed_values << value
       end
     end
 

data/lib/valid_attribute/version.rb

@@ -1,3 +1,3 @@
 module ValidAttribute
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/valid_attribute_spec.rb

@@ -31,7 +31,7 @@ describe 'ValidAttribute' do
       describe 'messages' do
         it '#negative_failue_message' do
           @matcher.matches?(@user)
-          @matcher.negative_failure_message.should == " expected User#name to not accept the values: \"abc\", 123"
+          @matcher.negative_failure_message.should == " expected User#name to reject the values: \"abc\", 123"
         end
       end
     end
@@ -82,7 +82,7 @@ describe 'ValidAttribute' do
 
         it '#negative_failure_message' do
           @matcher.matches?(@user)
-          @matcher.negative_failure_message.should == " expected User#name to not accept the value: \"abc\""
+          @matcher.negative_failure_message.should == " expected User#name to reject the value: \"abc\""
         end
 
         it '#description' do
@@ -90,13 +90,55 @@ describe 'ValidAttribute' do
         end
       end
     end
-  end
 
-  it 'requires .when to always be used' do
-    matcher = @should.have_valid(:name)
-    expect do
-      matcher.matches?(@user)
-    end.to raise_error ValidAttribute::NoValues, "you need to set the values with .when on the matcher. Example: have_valid(:name).when('Brian')"
+    context 'no values are specified with .when' do
+      context 'data is valid' do
+        before do
+          @user.stubs(:valid?).returns(true)
+          @user.stubs(:name).returns(:abc)
+          @matcher = @should.have_valid(:name)
+        end
+
+        it 'matches? returns true' do
+          @matcher.matches?(@user).should be_true
+        end
+
+        it 'does_not_match? returns false' do
+          @matcher.does_not_match?(@user).should be_false
+        end
+
+        describe 'messages' do
+          it '#negative_failue_message' do
+            @matcher.matches?(@user)
+            @matcher.negative_failure_message.should == " expected User#name to reject the value: :abc"
+          end
+        end
+      end
+
+      context 'data is invalid' do
+        before do
+          @user.stubs(:valid?).returns(false)
+          @user.stubs(:errors).returns({:name => ["can't be a symbol"]})
+          @user.stubs(:name).returns(:abc)
+          @matcher = @should.have_valid(:name)
+        end
+
+        it 'matches? returns false' do
+          @matcher.matches?(@user).should be_false
+        end
+
+        it 'does_not_match? returns true' do
+          @matcher.does_not_match?(@user).should be_true
+        end
+
+        describe 'messages' do
+          it '#failue_message' do
+            @matcher.matches?(@user)
+            @matcher.failure_message.should == " expected User#name to accept the value: :abc"
+          end
+        end
+      end
+    end
   end
 
 end

metadata

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