valid_attribute 0.0.1 → 0.0.2

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+doc/
+.yardoc

data/HISTORY

@@ -0,0 +1,3 @@
+== 0.0.2
+  Removed default value, allways required to pass value
+  Changed #with to #when

data/README.markdown

@@ -27,18 +27,17 @@ Instead of having validation specific matchers ValidAttribute only cares if the
     end
 
     describe User do
-      # The .with method can take any number of values that you want to pass
-      it { should have_valid(:email).with('test@test.com', 'test+spam@gmail.com') }
-      it { should_not have_valid(:email).with('fail', 123).message('invalid email format') }
-      it { should have_valid(:name).with('TestName')
-      it { should_not have_valid(:name).with('Test')
+      # 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 have_valid(:name).when('TestName')
+      it { should_not have_valid(:name).when('Test')
 
       # Because 'should' works off the the 'subject' in RSpec we can set other values if necessary for a given validation test
       describe 'password' do
         before { subject.password_confirmation = 'password' }
-        it { should have_valid(:password).with('password') }
-        # Not providing '.with' defaults to nil
-        it { should_not have_valid(:password) }
+        it { should have_valid(:password).when('password') }
+        it { should_not have_valid(:password).when(nil) }
       end
     end
 

data/lib/valid_attribute/version.rb

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

data/lib/valid_attribute.rb

@@ -1,5 +1,15 @@
 module ValidAttribute
-
+  class NoValues < StandardError; end
+  # Test if an attribute is valid
+  #
+  # examples:
+  #  it { should have_valid(:name).when('Brian') }
+  #  it { should_not have_valid(:name).message("can't be blank") }
+  #  it { should have_valid(:email).when('test@test.com', 'test+spam@gmail.com') }
+  #
+  # @param [Symbol]
+  #
+  # @return [ValidAttribute::ValidAttributeMatcher]
   def have_valid(attr)
     ValidAttributeMatcher.new(attr)
   end
@@ -9,10 +19,9 @@ module ValidAttribute
 
     def initialize(attr)
       self.attr   = attr
-      self.values = [nil]
     end
 
-    def with(*values)
+    def when(*values)
       self.values = values
       self
     end
@@ -45,6 +54,10 @@ module ValidAttribute
     end
 
     def matches?(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
 
       values.each do |value|

data/spec/valid_attribute_spec.rb

@@ -29,12 +29,12 @@ describe 'ValidAttribute' do
     end
 
     it 'passes with no value set' do
-      matcher = @should.have_valid(:name)
+      matcher = @should.have_valid(:name).when(nil)
       matcher.matches?(@user).should be_true
     end
 
     it 'passes with values set' do
-      matcher = @should.have_valid(:name).with('Brian', 'Stephanie')
+      matcher = @should.have_valid(:name).when('Brian', 'Stephanie')
       matcher.matches?(@user).should be_true
     end
   end
@@ -46,17 +46,17 @@ describe 'ValidAttribute' do
     end
 
     it 'returns false when no message passed' do
-      matcher = @should.have_valid(:name)
+      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).message('wrong message')
+      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).message('is not valid')
+      matcher = @should.have_valid(:name).when(nil).message('is not valid')
       matcher.matches?(@user).should be_false
     end
   end
@@ -68,7 +68,7 @@ describe 'ValidAttribute' do
     end
 
     it 'returns false' do
-      matcher = @should.have_valid(:name).with('true', 'false')
+      matcher = @should.have_valid(:name).when('true', 'false')
       matcher.matches?(@user).should be_false
     end
   end
@@ -80,13 +80,13 @@ describe 'ValidAttribute' do
     end
 
     it 'has a message for string values' do
-      matcher = @should.have_valid(:name).with('Brian')
+      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).with(123)
+      matcher = @should.have_valid(:name).when(123)
       matcher.matches?(@user)
       matcher.failure_message.should == " expected User#name to accept a value of 123"
     end
@@ -99,22 +99,29 @@ describe 'ValidAttribute' do
     end
 
     it 'has a message for string values' do
-      matcher = @should.have_valid(:name).with('Brian')
+      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'"
     end
 
     it 'has a message for non string values' do
-      matcher = @should.have_valid(:name).with(123)
+      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"
     end
 
     it 'includes the validation message' do
-      matcher = @should.have_valid(:name).with('Brian').message('is not valid')
+      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'"
     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 (ex. it { should have_valid(:name).when('Brian') })"
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: valid_attribute
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -04:00
+date: 2011-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - .rspec
 - .rvmrc
 - Gemfile
+- HISTORY
 - README.markdown
 - Rakefile
 - lib/valid_attribute.rb