valid_attribute 1.2.0 → 1.3.0

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 .bundle
-Gemfile.lock
+*.lock
 pkg/*
 doc/
 .yardoc
+bin/*

data/.rspec

@@ -1 +1,2 @@
 --color
+--debugger

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
   - 1.8.7
   - 1.9.2
-  - rbx
-  - rbx-2.0
+  - 1.9.3
+  - rbx-18mode
   - ree
   - jruby

data/.yardopts

@@ -0,0 +1,2 @@
+--markup-provider=redcarpet
+--markup=markdown

data/README.markdown

@@ -6,7 +6,7 @@ ValidAttribute is a minimalist matcher for validation BDD.
 
 Supported ORMs
 
-* ActiveModel based (ActiveRecord >= 3.0, Mongoid >= 2.0, MongoMapper >= 0.9
+* ActiveModel based (ActiveRecord >= 3.0, Mongoid >= 2.0, MongoMapper >= 0.9)
 * ActiveRecord <= 2.3
 * DataMapper
 * Custom (with compatible API, see below)
@@ -43,7 +43,6 @@ If you want to you use it with `MiniTest::Spec` you can use either `shoulda-cont
 gem 'minitest-matchers'
 
 # test_helper.rb
-require 'minitest/matchers'
 require 'valid_attribute'
 ```
 
@@ -106,20 +105,16 @@ 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') }
+  it { must have_valid(:email).when('test@test.com', 'test+spam@gmail.com') }
+  it { wont have_valid(:email).when('fail', 123) }
+  it { must have_valid(:name).when('TestName') }
+  it { 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) }
+    subject { User.new.tap { |u| u.password_confirmation = "password" } }
+    it { must have_valid(:password).when('password') }
+    it { wont have_valid(:password).when(nil) }
   end
-
-  # Using .when is optional. Without it, the existing value is examined.
-  wont have_valid(:email)
 end
 ```
 
@@ -146,10 +141,23 @@ class User
 end
 ```
 
+## Cloning ##
+
+If you feel that the setters are mutating parts of the object when
+testing multiple values you can force the test subject be cloned in
+between each test
+
+```ruby
+it { should have_valid(:name).when('Brian').clone }
+```
+
+Be aware the cloning can cause some unpredicatable results and may lead
+to more pain than help
+
 ## Legal ##
 
-Brian Cardarella &copy; 2011
+[DockYard](http://dockyard.com), LLC &copy; 2012
 
-[@bcardarella](http://twitter.com/bcardarella)
+[@dockyard](http://twitter.com/dockyard)
 
 [Licensed under the MIT license](http://www.opensource.org/licenses/mit-license.php)

data/lib/valid_attribute.rb

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

data/lib/valid_attribute/matcher.rb

@@ -41,6 +41,14 @@ module ValidAttribute
       !failed_values.empty? && passed_values.empty?
     end
 
+    def clone?
+      !!@clone
+    end
+
+    def clone
+      @clone = true
+    end
+
     private
 
     def check_values(subject)
@@ -61,19 +69,19 @@ module ValidAttribute
     end
 
     def check_value(value)
-      cloned_subject = subject.clone
-      cloned_subject.send("#{attr}=", value)
-      cloned_subject.valid?
+      _subject = clone? ? subject.clone : subject
+      _subject.send("#{attr}=", value)
+      _subject.valid?
 
-      if invalid_attribute?(cloned_subject, attr)
+      if invalid_attribute?(_subject, attr)
         self.failed_values << value
       else
         self.passed_values << value
       end
     end
 
-    def invalid_attribute?(cloned_subject, attr)
-      errors = cloned_subject.errors[attr]
+    def invalid_attribute?(_subject, attr)
+      errors = _subject.errors[attr]
       errors.respond_to?(:empty?) ? !errors.empty? : !!errors
     end
 

data/lib/valid_attribute/minitest.rb

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

data/lib/valid_attribute/spec.rb

@@ -0,0 +1,3 @@
+Spec::Runner.configure do |config|
+  config.include ValidAttribute::Method
+end

data/lib/valid_attribute/version.rb

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

data/spec/minitest_spec.rb

@@ -4,7 +4,7 @@ require 'valid_attribute/minitest'
 
 describe 'MiniTest::Spec' do
   it '.have_valid' do
-    MiniTest::Spec.have_valid(:name).should be_instance_of(ValidAttribute::Matcher)
+    have_valid(:name).should be_instance_of(ValidAttribute::Matcher)
   end
 end
 

data/spec/spec_helper.rb

@@ -1,14 +1,14 @@
 require 'rubygems'
 require 'bundler'
-Bundler.setup
+Bundler.require
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'ruby-debug'
 require 'rspec'
 require 'rspec/autorun'
 require 'bourne'
 require 'valid_attribute'
+require 'debugger'
 
 RSpec.configure do |config|
   config.mock_with :mocha

data/spec/valid_attribute_spec.rb

@@ -154,6 +154,26 @@ describe 'ValidAttribute' do
         end
       end
     end
+
+    describe 'cloning' do
+      before do
+        @matcher = @should.have_valid(:name)
+      end
+
+      context 'when no cloning' do
+        it 'returns false' do
+          @matcher.clone?.should be_false
+        end
+      end
+      context 'when cloned' do
+        before do
+          @matcher.clone
+        end
+        it 'returns true' do
+          @matcher.clone?.should be_true
+        end
+      end
+    end
   end
 
 end

data/valid_attribute.gemspec

@@ -19,14 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'bourne'
+  s.add_development_dependency 'minitest'
   s.add_development_dependency 'minitest-matchers'
-  if RUBY_VERSION >= '1.9'
-    if RUBY_VERSION <= '1.9.2'
-      s.add_development_dependency 'ruby-debug19'
-    end
-  else
-    s.add_development_dependency 'ruby-debug'
-  end
+  s.add_development_dependency 'debugger'
 end

metadata

@@ -1,76 +1,124 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: valid_attribute
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Brian Cardarella
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-05 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+date: 2012-08-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bourne
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest-matchers
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-matchers
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Minimalist validation matcher
-email: 
+email:
 - bcardarella@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
 - .travis.yml
+- .yardopts
 - Gemfile
 - HISTORY
 - README.markdown
@@ -80,6 +128,7 @@ files:
 - lib/valid_attribute/method.rb
 - lib/valid_attribute/minitest.rb
 - lib/valid_attribute/rspec.rb
+- lib/valid_attribute/spec.rb
 - lib/valid_attribute/test_unit.rb
 - lib/valid_attribute/version.rb
 - spec/minitest_spec.rb
@@ -88,35 +137,37 @@ files:
 - spec/user.rb
 - spec/valid_attribute_spec.rb
 - valid_attribute.gemspec
-has_rdoc: true
 homepage: https://github.com/bcardarella/valid_attribute
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 2438991157879859276
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 2438991157879859276
 requirements: []
-
 rubyforge_project: valid_attribute
-rubygems_version: 1.3.9.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Minimalist validation matcher
-test_files: 
+test_files:
 - spec/minitest_spec.rb
 - spec/spec_helper.rb
 - spec/test_unit_spec.rb