accept_values_for 0.4.2 → 0.4.3

data/Changelog.textile

@@ -1,4 +1,4 @@
-h3 0.4.2
+h3. 0.4.2
 
 * Make suitable to use with any ORM based on ActiveModel::Validations
 

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/accept_values_for.rb

@@ -37,6 +37,7 @@ class AcceptValuesFor  #:nodoc:
   def matches?(model)
     @model = model
     return false unless model.class.included_modules.include?(ActiveModel::Validations)
+    old_value = @model.send(@attribute)
     @values.each do |value|
       model.send("#{@attribute}=", value)
       model.valid?
@@ -46,11 +47,14 @@ class AcceptValuesFor  #:nodoc:
       end
     end
     return true
+  ensure
+    @model.send("#{@attribute}=", old_value) if defined?(old_value)
   end
 
   def does_not_match?(model)
     @model = model
     return false unless model.class.included_modules.include?(ActiveModel::Validations)
+    old_value = @model.send(@attribute)
     @values.each do |value|
       model.send("#{@attribute}=", value)
       model.valid?
@@ -60,6 +64,8 @@ class AcceptValuesFor  #:nodoc:
       end
     end
     return true
+  ensure
+    @model.send("#{@attribute}=", old_value) if defined?(old_value)
   end
 
   def failure_message_for_should

data/spec/accept_values_for_spec.rb

@@ -3,10 +3,6 @@ require 'spec_helper'
 describe "AcceptValuesFor" do
   subject { Person.new(:gender => "MALE", :group => Group.new(:name => "Primary")) }
 
-  it {should accept_values_for(:gender, "MALE", "FEMALE")}
-  it {should_not accept_values_for(:gender, "INVALID", nil)}
-  it { should_not accept_values_for(:group, nil) }
-  it { should accept_values_for(:group, Group.new) }
 
   it "should have custom condition for should_not" do
     accept_values_for(:gender, "INVALID", "MALE").does_not_match?(subject).should be_false
@@ -20,5 +16,17 @@ describe "AcceptValuesFor" do
       matcher.failure_message_for_should.should == "expected #{subject.inspect} to accept value \"INVALID\" for :gender, but it was not\n" +
         "Errors: gender is not included in the list"
     end
+
+    it "should assign the old value for attribute after #matches? " do
+      matcher.matches?(subject).should be_false
+      subject.gender.should == "MALE"
+    end
+  end
+
+  describe "api" do
+    it { should accept_values_for(:gender, "MALE", "FEMALE")}
+    it { should_not accept_values_for(:gender, "INVALID", nil)}
+    it { should_not accept_values_for(:group, nil) }
+    it { should accept_values_for(:group, Group.new) }
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: accept_values_for
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 +02:00
+date: 2011-03-30 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency