valid_attribute 1.1.0 → 1.2.0

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - rbx
+  - rbx-2.0
+  - ree
+  - jruby

data/HISTORY

@@ -1,3 +1,6 @@
+== 1.2.0
+  MiniTest::Spec support [wojtekmach]
+
 == 1.1.0
   #when is not necessary [davisre]
 

data/README.markdown

@@ -1,5 +1,7 @@
 # ValidAttribute #
 
+[![Build Status](http://travis-ci.org/bcardarella/valid_attribute.png)](http://travis-ci.org/bcardarella/valid_attribute)
+
 ValidAttribute is a minimalist matcher for validation BDD.
 
 Supported ORMs
@@ -34,6 +36,17 @@ require 'shoulda-context'
 require 'valid_attribute'
 ```
 
+If you want to you use it with `MiniTest::Spec` you can use either `shoulda-context` (see above) or [minitest-matchers](https://github.com/zenspider/minitest-matchers):
+
+```ruby
+# Gemfile
+gem 'minitest-matchers'
+
+# test_helper.rb
+require 'minitest/matchers'
+require 'valid_attribute'
+```
+
 ## Usage ##
 
 Instead of having validation specific matchers `ValidAttribute` only cares if the attribute is valid under certain circumstances
@@ -87,6 +100,27 @@ class UserTest < Test::Unit::TestCase
   # Using .when is optional. Without it, the existing value is examined.
   should_not have_valid(:email)
 end
+
+# Minitest::Matchers
+require 'minitest/matchers'
+describe User do
+  subject { User.new }
+
+  # The .when method can take any number of values that you want to pass
+  must { have_valid(:email).when('test@test.com', 'test+spam@gmail.com') }
+  wont { have_valid(:email).when('fail', 123) }
+  must { have_valid(:name).when('TestName') }
+  wont { have_valid(:name).when('Test') }
+
+  describe 'password' do
+    subject { User.new(:password_confirmation => 'password') }
+    must {  have_valid(:password).when('password') }
+    wont {  have_valid(:password).when(nil) }
+  end
+
+  # Using .when is optional. Without it, the existing value is examined.
+  wont have_valid(:email)
+end
 ```
 
 ## Custom Models ##

data/Rakefile

@@ -1,2 +1,8 @@
 require 'bundler'
+require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
+
+RSpec::Core::RakeTask.new('default') do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
+end
+

data/lib/valid_attribute.rb

@@ -7,6 +7,8 @@ end
 
 if defined?(RSpec)
   require 'valid_attribute/rspec'
+elsif defined?(MiniTest::Matchers)
+  require 'valid_attribute/minitest'
 else
   require 'valid_attribute/test_unit'
 end

data/lib/valid_attribute/matcher.rb

@@ -28,7 +28,7 @@ module ValidAttribute
     end
 
     def description
-      "be valid when: #{quote_values(values)}"
+      "be valid when #{attr} is: #{quote_values(values)}"
     end
 
     def matches?(subject)
@@ -48,36 +48,32 @@ module ValidAttribute
       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|
         check_value value
       end
     end
 
-    def check_existing_value
-      check_value subject.send("#{attr}")
+    def values
+      unless @values
+        @values = [subject.send(attr)]
+      end
+      @values
     end
 
     def check_value(value)
-      subject.send("#{attr}=", value)
-      subject.valid?
+      cloned_subject = subject.clone
+      cloned_subject.send("#{attr}=", value)
+      cloned_subject.valid?
 
-      if invalid_attribute?(subject, attr)
+      if invalid_attribute?(cloned_subject, attr)
         self.failed_values << value
       else
         self.passed_values << value
       end
     end
 
-    def invalid_attribute?(subject, attr)
-      errors = subject.errors[attr]
+    def invalid_attribute?(cloned_subject, attr)
+      errors = cloned_subject.errors[attr]
       errors.respond_to?(:empty?) ? !errors.empty? : !!errors
     end
 

data/lib/valid_attribute/minitest.rb

@@ -0,0 +1,3 @@
+class MiniTest::Spec
+  extend ::ValidAttribute::Method
+end

data/lib/valid_attribute/version.rb

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

data/spec/minitest_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'minitest/spec'
+require 'valid_attribute/minitest'
+
+describe 'MiniTest::Spec' do
+  it '.have_valid' do
+    MiniTest::Spec.have_valid(:name).should be_instance_of(ValidAttribute::Matcher)
+  end
+end
+

data/spec/valid_attribute_spec.rb

@@ -29,7 +29,7 @@ describe 'ValidAttribute' do
       end
 
       describe 'messages' do
-        it '#negative_failue_message' do
+        it '#negative_failure_message' do
           @matcher.matches?(@user)
           @matcher.negative_failure_message.should == " expected User#name to reject the values: \"abc\", 123"
         end
@@ -52,7 +52,7 @@ describe 'ValidAttribute' do
       end
 
       describe 'messages' do
-        it '#failue_message' do
+        it '#failure_message' do
           @matcher.matches?(@user)
           @matcher.failure_message.should == " expected User#name to accept the values: :abc, nil"
         end
@@ -86,12 +86,27 @@ describe 'ValidAttribute' do
         end
 
         it '#description' do
-          @matcher.description.should == "be valid when: \"abc\", 123"
+          @matcher.description.should == "be valid when name is: \"abc\", 123"
         end
       end
     end
 
     context 'no values are specified with .when' do
+      context 'data is not set' do
+        before do
+          @user.stubs(:valid?).returns(true)
+          @user.stubs(:name).returns(nil)
+          @matcher = @should.have_valid(:name)
+        end
+
+        subject do
+          @matcher.matches?(@user)
+          @matcher
+        end
+
+        its(:description) { should eq('be valid when name is: nil') }
+      end
+
       context 'data is valid' do
         before do
           @user.stubs(:valid?).returns(true)
@@ -108,7 +123,7 @@ describe 'ValidAttribute' do
         end
 
         describe 'messages' do
-          it '#negative_failue_message' do
+          it '#negative_failure_message' do
             @matcher.matches?(@user)
             @matcher.negative_failure_message.should == " expected User#name to reject the value: :abc"
           end
@@ -132,7 +147,7 @@ describe 'ValidAttribute' do
         end
 
         describe 'messages' do
-          it '#failue_message' do
+          it '#failure_message' do
             @matcher.matches?(@user)
             @matcher.failure_message.should == " expected User#name to accept the value: :abc"
           end

data/valid_attribute.gemspec

@@ -21,8 +21,11 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'bourne'
+  s.add_development_dependency 'minitest-matchers'
   if RUBY_VERSION >= '1.9'
-    s.add_development_dependency 'ruby-debug19'
+    if RUBY_VERSION <= '1.9.2'
+      s.add_development_dependency 'ruby-debug19'
+    end
   else
     s.add_development_dependency 'ruby-debug'
   end

metadata

@@ -2,7 +2,7 @@
 name: valid_attribute
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 -04:00
+date: 2011-09-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
+  name: minitest-matchers
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -46,6 +46,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Minimalist validation matcher
 email: 
 - bcardarella@gmail.com
@@ -59,6 +70,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - HISTORY
 - README.markdown
@@ -66,9 +78,11 @@ files:
 - lib/valid_attribute.rb
 - lib/valid_attribute/matcher.rb
 - lib/valid_attribute/method.rb
+- lib/valid_attribute/minitest.rb
 - lib/valid_attribute/rspec.rb
 - lib/valid_attribute/test_unit.rb
 - lib/valid_attribute/version.rb
+- spec/minitest_spec.rb
 - spec/spec_helper.rb
 - spec/test_unit_spec.rb
 - spec/user.rb
@@ -98,11 +112,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: valid_attribute
-rubygems_version: 1.5.3
+rubygems_version: 1.3.9.2
 signing_key: 
 specification_version: 3
 summary: Minimalist validation matcher
 test_files: 
+- spec/minitest_spec.rb
 - spec/spec_helper.rb
 - spec/test_unit_spec.rb
 - spec/user.rb