rich-acts_as_revisable 1.1.0 → 1.1.1

data/lib/acts_as_revisable/base.rb

@@ -1,5 +1,6 @@
 require 'acts_as_revisable/options'
 require 'acts_as_revisable/quoted_columns'
+require 'acts_as_revisable/validations'
 require 'acts_as_revisable/acts/common'
 require 'acts_as_revisable/acts/revision'
 require 'acts_as_revisable/acts/revisable'
@@ -45,6 +46,7 @@ module WithoutScope
           self.revisable_options = Options.new(options, &block)
           
           self.send(:include, Common)
+          self.send(:extend, Validations) unless self.revisable_options.no_validation_scoping?
           self.send(:include, WithoutScope::QuotedColumnConditions)
         end
     end

data/lib/acts_as_revisable/validations.rb

@@ -0,0 +1,11 @@
+module WithoutScope
+  module ActsAsRevisable
+    module Validations
+      def validates_uniqueness_of(*args)
+        options = args.extract_options!
+        (options[:scope] ||= []) << :revisable_is_current
+        super(*(args << options))
+      end
+    end
+  end
+end

data/lib/acts_as_revisable/version.rb

@@ -3,7 +3,7 @@ module WithoutScope #:nodoc:
     module VERSION #:nodoc:
       MAJOR = 1
       MINOR = 1
-      TINY  = 0
+      TINY  = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/spec_helper.rb

@@ -97,11 +97,15 @@ class Session < ActiveRecord::Base
 end
 
 class Foo < ActiveRecord::Base
-  acts_as_revisable :generate_revision_class => true
+  acts_as_revisable :generate_revision_class => true, :no_validation_scoping => true
+  
+  validates_uniqueness_of :name
 end
 
 class Post < ActiveRecord::Base
-  acts_as_revisable
+  acts_as_revisable 
+  
+  validates_uniqueness_of :name
 end
 
 class PostRevision < ActiveRecord::Base

data/spec/validations_spec.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe WithoutScope::ActsAsRevisable, "with validations" do  
+  after(:each) do
+    cleanup_db
+  end
+  
+  before(:each) do
+    @post = Post.create(:name => 'a post')
+    @foo = Foo.create(:name => 'a foo')
+    
+  end
+  
+  describe "unique fields" do
+    it "should allow revisions" do
+      lambda {@post.revise!; @post.revise!}.should_not raise_error
+    end    
+  end
+  
+  describe "unique fields with validation scoping off" do
+    it "should not allow revisions" do
+      lambda {@foo.revise!; @foo.revise!}.should raise_error
+    end    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rich-acts_as_revisable
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Rich Cavanaugh
@@ -38,6 +38,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/sti_spec.rb
+- spec/validations_spec.rb
 - lib/acts_as_revisable
 - lib/acts_as_revisable/acts
 - lib/acts_as_revisable/acts/common.rb
@@ -48,6 +49,7 @@ files:
 - lib/acts_as_revisable/gem_spec_options.rb
 - lib/acts_as_revisable/options.rb
 - lib/acts_as_revisable/quoted_columns.rb
+- lib/acts_as_revisable/validations.rb
 - lib/acts_as_revisable/version.rb
 - lib/acts_as_revisable.rb
 - generators/revisable_migration