rich-acts_as_revisable 0.9.8 → 1.0.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = acts_as_revisable
 
-http://github.com/fatjam/acts_as_revisable/tree/master
+http://github.com/rich/acts_as_revisable
 
 == DESCRIPTION:
 
@@ -11,7 +11,9 @@ This plugin wouldn't exist without Rick Olsen's acts_as_versioned. AAV has been
 == FEATURES:
 
 * Both the revisable and revision models must be explicitly defined.
-  Yes, this is a feature. The less magic needed the better. This allows you to build up your revision models just as you would any other.
+  Yes, this is a feature. The less magic needed the better. This allows you to build up your revision models just as you would any other. 
+  
+  If you absolutely need a generated revision model, you may pass ":generate_revision_class => true" to acts_as_revisable and it will generate the class at runtime for you. Think of this like scaffolding and not to be kept around for a real application.
 
 * Numerous custom callbacks for both revisable and revision models.
   * revisable models
@@ -22,6 +24,8 @@ This plugin wouldn't exist without Rick Olsen's acts_as_versioned. AAV has been
     * before_changeset
     * after_changeset
     * after_branch_created
+    * before_revise_on_destroy (when :on_destroy => :revise is set)
+    * after_revise_on_destroy (when :on_destroy => :revise is set)
   * revision models
     * before_restore
     * after_restore
@@ -33,7 +37,6 @@ This plugin wouldn't exist without Rick Olsen's acts_as_versioned. AAV has been
   * Provides migration generators to add the revisable columns.
 * Grouping several revisable actions into a single revision (changeset).
 * Monitor all or just specified columns to trigger a revision.
-* Clone all or specified associations to the revision model.
 * Uses ActiveRecord's dirty attribute tracking.
 * Several ways to find revisions including:
   * revision number
@@ -72,7 +75,7 @@ Create the revision class:
 
   class Session < ActiveRecord::Base
     # we can accept the more standard hash syntax
-    acts_as_revision :revisable_class_name => "Project", :clone_associations => :all
+    acts_as_revision :revisable_class_name => "Project"
   end
 
 Some example usage:
@@ -154,10 +157,6 @@ Changesets:
   # our revision number has only incremented by one
   @project.revision_number        # => 3
   
-Associations have been cloned:
-
-  @project.owner === @previous.owner   # => true
-
 Maybe we don't want to be able to branch from revisions:
 
   class Session < ActiveRecord::Base
@@ -184,23 +183,23 @@ If the owner isn't set let's prevent reverting:
 
 == REQUIREMENTS:
 
-This plugin currently depends on Edge Rails, ActiveRecord and ActiveSupport specifically, which will eventually become Rails 2.1.
+This plugin requires Rails 2.3. Use version 0.9.8 of this plugin for Rails 2.1 and 2.2.
 
 == INSTALL:
 
 acts_as_revisable uses Rails' new ability to use gems as plugins. Installing AAR is as simple as installing a gem:
 
-  sudo gem install fatjam-acts_as_revisable --source=http://gems.github.com
+  sudo gem install rich-acts_as_revisable --source=http://gems.github.com
 
 Once the gem is installed you'll want to activate it in your Rails app by adding the following line to config/environment.rb:
 
-  config.gem "fatjam-acts_as_revisable", :lib => "acts_as_revisable", :source => "http://gems.github.com"
+  config.gem "rich-acts_as_revisable", :lib => "acts_as_revisable", :source => "http://gems.github.com"
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2008 JamLab, LLC.
+Copyright (c) 2009 Rich Cavanaugh
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -14,7 +14,7 @@ Rake::RDocTask.new do |rdoc|
 end
 
 spec = Gem::Specification.new do |s|
-  FatJam::ActsAsRevisable::GemSpecOptions::HASH.each do |key, value|
+  WithoutScope::ActsAsRevisable::GemSpecOptions::HASH.each do |key, value|
     s.send("#{key.to_s}=",value)
   end
 end
@@ -25,7 +25,7 @@ end
 
 desc "Generate the static gemspec required for github."
 task :generate_gemspec do
-  options = FatJam::ActsAsRevisable::GemSpecOptions::HASH.clone
+  options = WithoutScope::ActsAsRevisable::GemSpecOptions::HASH.clone
   options[:name] = "acts_as_revisable"
   
   spec = ["Gem::Specification.new do |s|"]
@@ -39,6 +39,6 @@ end
 
 desc "Install acts_as_revisable"
 task :install => :repackage do
-    options = FatJam::ActsAsRevisable::GemSpecOptions::HASH.clone
+    options = WithoutScope::ActsAsRevisable::GemSpecOptions::HASH.clone
     sh %{sudo gem install pkg/#{options[:name]}-#{spec.version} --no-rdoc --no-ri}
 end

data/lib/acts_as_revisable/acts/common.rb

@@ -1,4 +1,4 @@
-module FatJam
+module WithoutScope
   module ActsAsRevisable
     # This module is mixed into the revision and revisable classes.
     # 
@@ -18,17 +18,12 @@ module FatJam
         base.class_inheritable_hash :revisable_current_states
         base.revisable_current_states = {}
         
-        class << base
-          alias_method_chain :instantiate, :revisable
-        end
-
         base.instance_eval do
           define_callbacks :before_branch, :after_branch      
           has_many :branches, (revisable_options.revision_association_options || {}).merge({:class_name => base.class_name, :foreign_key => :revisable_branched_from_id})
                     
           belongs_to :branch_source, :class_name => base.class_name, :foreign_key => :revisable_branched_from_id
           after_save :execute_blocks_after_save
-          disable_revisable_scope :branch_source, :branches
         end        
       end
             
@@ -151,7 +146,11 @@ module FatJam
       
       # Accessor for revisable_number just to make external API more pleasant.
       def revision_number
-        self[:revisable_number]
+        self[:revisable_number] ||= 0
+      end
+      
+      def revision_number=(value)
+        self[:revisable_number] = value
       end
       
       def diffs(what)
@@ -163,32 +162,11 @@ module FatJam
         end
       end
       
-      module ClassMethods
-        def disable_revisable_scope(*args)
-          args.each do |a|            
-            class_eval <<-EOT
-              def #{a.to_s}_with_open_scope(*args, &block)
-                assoc = self.class.reflect_on_association(#{a.inspect})
-                models = [self.class]
-                
-                if [:has_many, :has_one].member? assoc.macro
-                  models << (assoc.options[:class_name] ? assoc.options[:class_name] : #{a.inspect}.to_s.singularize.camelize).constantize
-                end
-                
-                begin
-                  models.each {|m| m.scoped_model_enabled = false}
-                  if associated = #{a.to_s}_without_open_scope(*args, &block)
-                    associated.reload
-                  end
-                ensure
-                  models.each {|m| m.scoped_model_enabled = true}
-                end
-              end
-            EOT
-            alias_method_chain a, :open_scope
-          end
-        end
-        
+      def deleted?
+        self.revisable_deleted_at.present?
+      end
+      
+      module ClassMethods        
         # Returns true if the revision should clone the given column.    
         def revisable_should_clone_column?(col) #:nodoc:
           return false if (REVISABLE_SYSTEM_COLUMNS + REVISABLE_UNREVISABLE_COLUMNS).member? col
@@ -198,12 +176,12 @@ module FatJam
         # acts_as_revisable's override for instantiate so we can
         # return the appropriate type of model based on whether
         # or not the record is the current record.
-        def instantiate_with_revisable(record) #:nodoc:
+        def instantiate(record) #:nodoc:
           is_current = columns_hash["revisable_is_current"].type_cast(
                 record["revisable_is_current"])
 
           if (is_current && self == self.revisable_class) || (!is_current && self == self.revision_class)
-            return instantiate_without_revisable(record)
+            return super(record)
           end
 
           object = if is_current

data/lib/acts_as_revisable/acts/deletable.rb

@@ -1,19 +1,19 @@
-module FatJam
+module WithoutScope
   module ActsAsRevisable
     module Deletable
       def self.included(base)        
         base.instance_eval do
-          alias_method_chain :destroy, :revisable
+          define_callbacks :before_revise_on_destroy, :after_revise_on_destroy
         end
       end
       
-      def destroy_with_revisable
+      def destroy
         now = Time.now
         
         prev = self.revisions.first
         self.revisable_deleted_at = now
         self.revisable_is_current = false
-                
+        
         self.revisable_current_at = if prev
           prev.update_attribute(:revisable_revised_at, now)
           prev.revisable_revised_at + 1.second
@@ -22,7 +22,11 @@ module FatJam
         end
         
         self.revisable_revised_at = self.revisable_deleted_at
-        self.save(:without_revision => true)
+        
+        return false unless run_callbacks(:before_revise_on_destroy) { |r, o| r == false}
+        returning(self.save(:without_revision => true)) do
+          run_callbacks(:after_revise_on_destroy)
+        end
       end
     end
   end

data/lib/acts_as_revisable/acts/revisable.rb

@@ -1,4 +1,4 @@
-module FatJam
+module WithoutScope
   module ActsAsRevisable
     
     # This module is mixed into the revision classes.
@@ -18,8 +18,6 @@ module FatJam
         base.send(:extend, ClassMethods)
                 
         class << base
-          alias_method_chain :find, :revisable
-          alias_method_chain :with_scope, :revisable
           attr_accessor :revisable_revision_class, :revisable_columns
         end
         
@@ -30,21 +28,24 @@ module FatJam
           attr_accessor :revisable_new_params, :revisable_revision
           
           define_callbacks :before_revise, :after_revise, :before_revert, :after_revert, :before_changeset, :after_changeset, :after_branch_created
-          
-          alias_method_chain :save, :revisable
-          alias_method_chain :save!, :revisable
-          
+                    
           before_create :before_revisable_create
           before_update :before_revisable_update
           after_update :after_revisable_update
           after_save :clear_revisable_shared_objects!, :unless => :is_reverting?
           
-          acts_as_scoped_model :find => {:conditions => {:revisable_is_current => true}}
+          default_scope :conditions => {:revisable_is_current => true}
           
           [:revisions, revisions_association_name.to_sym].each do |assoc|
             has_many assoc, (revisable_options.revision_association_options || {}).merge({:class_name => revision_class_name, :foreign_key => :revisable_original_id, :order => "#{quoted_table_name}.#{connection.quote_column_name(:revisable_number)} DESC", :dependent => :destroy})
           end
         end
+        
+        if !Object.const_defined?(base.revision_class_name) && base.revisable_options.generate_revision_class?
+          Object.const_set(base.revision_class_name, Class.new(ActiveRecord::Base)).class_eval do
+            acts_as_revision
+          end            
+        end
       end
       
       # Finds a specific revision of self.
@@ -80,7 +81,7 @@ module FatJam
           revisions.first
         when Time
           revisions.find(:first, :conditions => ["? >= ? and ? <= ?", :revisable_revised_at, by, :revisable_current_at, by])
-        when self[:revisable_number]
+        when self.revisable_number
           self
         else
           revisions.find_by_revisable_number(by)
@@ -274,23 +275,23 @@ module FatJam
       end
       
       # acts_as_revisable's override for ActiveRecord::Base's #save!
-      def save_with_revisable!(*args) #:nodoc:
+      def save!(*args) #:nodoc:
         self.revisable_new_params ||= args.extract_options!
         self.no_revision! if self.revisable_new_params.delete :without_revision
-        save_without_revisable!
+        super
       end
       
       # acts_as_revisable's override for ActiveRecord::Base's #save  
-      def save_with_revisable(*args) #:nodoc:
+      def save(*args) #:nodoc:
         self.revisable_new_params ||= args.extract_options!
         self.no_revision! if self.revisable_new_params.delete :without_revision
-        save_without_revisable(args)
+        super(args)
       end
       
       # Set some defaults for a newly created +Revisable+ instance.
       def before_revisable_create #:nodoc:
         self[:revisable_is_current] = true
-        self[:revisable_number] = 1
+        self.revision_number ||= 0
       end
       
       # Checks whether or not a +Revisable+ should be revised.
@@ -347,9 +348,9 @@ module FatJam
 
         rev.revisable_original_id = self.id
         
-        new_revision_number = revisions.maximum(:revisable_number) + 1 rescue self.revisable_number
-        rev.revisable_number = new_revision_number
-        self.revisable_number = new_revision_number + 1
+        new_revision_number = revisions.maximum(:revisable_number) + 1 rescue self.revision_number
+        rev.revision_number = new_revision_number
+        self.revision_number = new_revision_number + 1
         
         self.class.column_names.each do |col|
           next unless self.class.revisable_should_clone_column? col
@@ -402,15 +403,15 @@ module FatJam
         #   with_scope(:with_revisions => true) do
         #     ...
         #   end
-        def with_scope_with_revisable(*args, &block) #:nodoc:
+        def with_scope(*args, &block) #:nodoc:
           options = (args.grep(Hash).first || {})[:find]
 
           if options && options.delete(:with_revisions)
-            without_model_scope do
-              with_scope_without_revisable(*args, &block)
+            with_exclusive_scope do
+              super(*args, &block)
             end
           else
-            with_scope_without_revisable(*args, &block)
+            super(*args, &block)
           end
         end
         
@@ -420,26 +421,18 @@ module FatJam
         # ==== Example
         # 
         #   find(:all, :with_revisions => true)
-        def find_with_revisable(*args) #:nodoc:
+        def find(*args) #:nodoc:
           options = args.grep(Hash).first
         
           if options && options.delete(:with_revisions)
-            without_model_scope do
-              find_without_revisable(*args)
+            with_exclusive_scope do
+              super(*args)
             end
           else
-            find_without_revisable(*args)
+            super(*args)
           end
         end
-        
-        # Equivalent to:
-        #   find(..., :with_revisions => true)
-        def find_with_revisions(*args)
-          args << {} if args.grep(Hash).blank?
-          args.grep(Hash).first.update({:with_revisions => true})
-          find_with_revisable(*args)
-        end
-      
+              
         # Returns the +revision_class_name+ as configured in
         # +acts_as_revisable+.
         def revision_class_name #:nodoc:
@@ -449,7 +442,7 @@ module FatJam
         # Returns the actual +Revision+ class based on the 
         # #revision_class_name.
         def revision_class #:nodoc:
-          self.revisable_revision_class ||= revision_class_name.constantize
+          self.revisable_revision_class ||= self.revision_class_name.constantize
         end
         
         # Returns the revisable_class which in this case is simply +self+.
@@ -460,7 +453,7 @@ module FatJam
         # Returns the name of the association acts_as_revisable
         # creates.
         def revisions_association_name #:nodoc:
-          revision_class_name.pluralize.downcase
+          revision_class_name.pluralize.underscore
         end
         
         # Returns an Array of the columns that are watched for changes.

data/lib/acts_as_revisable/acts/revision.rb

@@ -1,6 +1,4 @@
-require 'acts_as_revisable/clone_associations'
-
-module FatJam
+module WithoutScope
   module ActsAsRevisable
     # This module is mixed into the revision classes.
     # 
@@ -20,14 +18,14 @@ module FatJam
         
         base.instance_eval do
           set_table_name(revisable_class.table_name)
-          acts_as_scoped_model :find => {:conditions => {:revisable_is_current => false}}
-          
-          CloneAssociations.clone_associations(revisable_class, self)
-        
+          default_scope :conditions => {:revisable_is_current => false}
+                  
           define_callbacks :before_restore, :after_restore
           before_create :revision_setup
           after_create :grab_my_branches
           
+          named_scope :deleted, :conditions => ["? is not null", :revisable_deleted_at]
+          
           [:current_revision, revisable_association_name.to_sym].each do |a|
             belongs_to a, :class_name => revisable_class_name, :foreign_key => :revisable_original_id
           end
@@ -111,7 +109,7 @@ module FatJam
         # Returns the actual +Revisable+ class based on the 
         # #revisable_class_name.
         def revisable_class #:nodoc:
-          self.revisable_revisable_class ||= revisable_class_name.constantize
+          self.revisable_revisable_class ||= self.revisable_class_name.constantize
         end
         
         # Returns the revision_class which in this case is simply +self+.
@@ -126,7 +124,7 @@ module FatJam
         # Returns the name of the association acts_as_revision
         # creates.
         def revisable_association_name #:nodoc:
-          revisable_class_name.downcase
+          revisable_class_name.underscore
         end
         
         # Returns an array of the associations that should be cloned.

data/lib/acts_as_revisable/base.rb

@@ -1,10 +1,11 @@
 require 'acts_as_revisable/options'
+require 'acts_as_revisable/quoted_columns'
 require 'acts_as_revisable/acts/common'
 require 'acts_as_revisable/acts/revision'
 require 'acts_as_revisable/acts/revisable'
 require 'acts_as_revisable/acts/deletable'
 
-module FatJam
+module WithoutScope
   # define the columns used internall by AAR
   REVISABLE_SYSTEM_COLUMNS = %w(revisable_original_id revisable_branched_from_id revisable_number revisable_name revisable_type revisable_current_at revisable_revised_at revisable_deleted_at revisable_is_current)
   
@@ -44,6 +45,7 @@ module FatJam
           self.revisable_options = Options.new(options, &block)
           
           self.send(:include, Common)
+          self.send(:include, WithoutScope::QuotedColumnConditions)
         end
     end
   end

data/lib/acts_as_revisable/gem_spec_options.rb

@@ -1,14 +1,14 @@
-module FatJam #:nodoc:
+module WithoutScope #:nodoc:
   module ActsAsRevisable
     class GemSpecOptions
       HASH = {
-        :name => "fatjam-acts_as_revisable",
-        :version => FatJam::ActsAsRevisable::VERSION::STRING,
+        :name => "rich-acts_as_revisable",
+        :version => WithoutScope::ActsAsRevisable::VERSION::STRING,
         :summary => "acts_as_revisable enables revision tracking, querying, reverting and branching of ActiveRecord models. Inspired by acts_as_versioned.",
-        :email => "cavanaugh@fatjam.com",
-        :homepage => "http://github.com/fatjam/acts_as_revisable/tree/master",
+        :email => "rich@withoutscope.com",
+        :homepage => "http://github.com/rich/acts_as_revisable",
         :has_rdoc => true,
-        :authors => ["Rich Cavanaugh of JamLab, LLC.", "Stephen Caudill of JamLab, LLC."],
+        :authors => ["Rich Cavanaugh", "Stephen Caudill"],
         :files => %w( LICENSE README.rdoc Rakefile ) + Dir["{spec,lib,generators,rails}/**/*"],
         :rdoc_options => ["--main", "README.rdoc"],
         :extra_rdoc_files => ["README.rdoc", "LICENSE"]

data/lib/acts_as_revisable/options.rb

@@ -1,4 +1,4 @@
-module FatJam
+module WithoutScope
   module ActsAsRevisable
     # This class provides for a flexible method of setting
     # options and querying them. This is especially useful

data/lib/acts_as_revisable/quoted_columns.rb

@@ -10,17 +10,13 @@
 # This is consistent with Rails and Ruby where symbols are used to
 # represent methods. Only a symbol matching a column name will 
 # trigger this beavior.
-module FatJam::QuotedColumnConditions
+module WithoutScope::QuotedColumnConditions
   def self.included(base)
     base.send(:extend, ClassMethods)
-
-    class << base
-      alias_method_chain :quote_bound_value, :quoted_column
-    end
   end
   
   module ClassMethods
-    def quote_bound_value_with_quoted_column(value)
+    def quote_bound_value(value)
       if value.is_a?(Symbol) && column_names.member?(value.to_s)
         # code borrowed from sanitize_sql_hash_for_conditions
         attr = value.to_s
@@ -29,7 +25,7 @@ module FatJam::QuotedColumnConditions
         return "#{table_name}.#{connection.quote_column_name(attr)}"
       end
       
-      quote_bound_value_without_quoted_column(value)
+      super(value)
     end
   end
 end

data/lib/acts_as_revisable/version.rb

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

data/lib/acts_as_revisable.rb

@@ -5,10 +5,6 @@ require 'activesupport' unless defined? ActiveSupport
 require 'activerecord' unless defined? ActiveRecord
 
 require 'acts_as_revisable/version.rb'
-require 'acts_as_revisable/acts/scoped_model'
-require 'acts_as_revisable/quoted_columns'
 require 'acts_as_revisable/base'
 
-ActiveRecord::Base.send(:include, FatJam::ActsAsScopedModel)
-ActiveRecord::Base.send(:include, FatJam::QuotedColumnConditions)
-ActiveRecord::Base.send(:include, FatJam::ActsAsRevisable)
+ActiveRecord::Base.send(:include, WithoutScope::ActsAsRevisable)

data/spec/associations_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe FatJam::ActsAsRevisable do  
+describe WithoutScope::ActsAsRevisable do  
   after(:each) do
     cleanup_db
   end

data/spec/branch_spec.rb

@@ -4,7 +4,7 @@ class Project
   validates_presence_of :name
 end
 
-describe FatJam::ActsAsRevisable, "with branching" do    
+describe WithoutScope::ActsAsRevisable, "with branching" do    
   after(:each) do
     cleanup_db
   end

data/spec/find_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe FatJam::ActsAsRevisable do    
+describe WithoutScope::ActsAsRevisable do    
   after(:each) do
     cleanup_db
   end
@@ -18,21 +18,13 @@ describe FatJam::ActsAsRevisable do
     it "should accept the :with_revisions options" do
       lambda { Project.find(:all, :with_revisions => true) }.should_not raise_error
     end
-    
-    it "should provide find_with_revisions" do
-      lambda { Project.find_with_revisions(:all) }.should_not raise_error
-    end
-    
+        
     it "should find current and revisions with the :with_revisions option" do      
       Project.find(:all, :with_revisions => true).size.should == 2
     end
-    
-    it "should find current and revisions with the find_with_revisions method" do
-      Project.find_with_revisions(:all).size.should == 2
-    end
-    
+        
     it "should find revisions with conditions" do
-      Project.find_with_revisions(:all, :conditions => {:name => "Rich"}).should == [@project1.find_revision(:previous)]
+      Project.find(:all, :conditions => {:name => "Rich"}, :with_revisions => true).should == [@project1.find_revision(:previous)]
     end
   end
 end

data/spec/general_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe FatJam::ActsAsRevisable do  
+describe WithoutScope::ActsAsRevisable do  
   after(:each) do
     cleanup_db
   end
@@ -9,6 +9,12 @@ describe FatJam::ActsAsRevisable do
     @project = Project.create(:name => "Rich", :notes => "this plugin's author")
   end
   
+  describe "with auto-generated revision class" do
+    it "should have a revision class" do
+      Foo.revision_class.should == FooRevision
+    end
+  end
+  
   describe "without revisions" do
     it "should have a revision_number of zero" do
       @project.revision_number.should be_zero

data/spec/options_spec.rb

@@ -38,10 +38,10 @@ shared_examples_for "common Options usage" do
   end
 end
 
-describe FatJam::ActsAsRevisable::Options do
+describe WithoutScope::ActsAsRevisable::Options do
   describe "with hash options" do
     before(:each) do
-      @options = FatJam::ActsAsRevisable::Options.new :one => 1, :yes => true, :no => false, :arr => [1,2,3]
+      @options = WithoutScope::ActsAsRevisable::Options.new :one => 1, :yes => true, :no => false, :arr => [1,2,3]
     end
     
     it_should_behave_like "common Options usage"
@@ -49,7 +49,7 @@ describe FatJam::ActsAsRevisable::Options do
   
   describe "with block options" do
     before(:each) do
-      @options = FatJam::ActsAsRevisable::Options.new do
+      @options = WithoutScope::ActsAsRevisable::Options.new do
         one 1
         yes true
         arr [1,2,3]
@@ -61,7 +61,7 @@ describe FatJam::ActsAsRevisable::Options do
   
   describe "with both block and hash options" do
     before(:each) do
-      @options = FatJam::ActsAsRevisable::Options.new(:yes => true, :arr => [1,2,3]) do
+      @options = WithoutScope::ActsAsRevisable::Options.new(:yes => true, :arr => [1,2,3]) do
         one 1
       end
     end
@@ -70,7 +70,7 @@ describe FatJam::ActsAsRevisable::Options do
     
     describe "the block should override the hash" do
       before(:each) do
-        @options = FatJam::ActsAsRevisable::Options.new(:yes => false, :one => 10, :arr => [1,2,3,4,5]) do
+        @options = WithoutScope::ActsAsRevisable::Options.new(:yes => false, :one => 10, :arr => [1,2,3,4,5]) do
           one 1
           yes true
           arr [1,2,3]

data/spec/quoted_columns_spec.rb

@@ -14,6 +14,6 @@ describe "the quoted_columns extension" do
   end
   
   it "should not quote strings any differently" do
-    Project.send(:quote_bound_value, "what").should == Project.send(:quote_bound_value_with_quoted_column, "what")
+    Project.send(:quote_bound_value, "what").should == ActiveRecord::Base.send(:quote_bound_value, "what")
   end  
 end

data/spec/revert_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe FatJam::ActsAsRevisable, "with reverting" do  
+describe WithoutScope::ActsAsRevisable, "with reverting" do  
   after(:each) do
     cleanup_db
   end

data/spec/spec_helper.rb

@@ -36,6 +36,15 @@ def setup_db
       t.datetime :revisable_current_at, :revisable_revised_at, :revisable_deleted_at
       t.timestamps
     end
+    
+    create_table :foos do |t|
+      t.string :name, :revisable_name, :revisable_type
+      t.text :notes
+      t.boolean :revisable_is_current
+      t.integer :revisable_original_id, :revisable_branched_from_id, :revisable_number, :project_id
+      t.datetime :revisable_current_at, :revisable_revised_at, :revisable_deleted_at
+      t.timestamps
+    end
   end
 end
 
@@ -52,6 +61,7 @@ class Person < ActiveRecord::Base
   
   acts_as_revisable do
     revision_class_name "OldPerson"
+    on_delete :revise
   end
 end
 
@@ -76,4 +86,8 @@ class Session < ActiveRecord::Base
     revisable_class_name "Project"
     clone_associations :all
   end
+end
+
+class Foo < ActiveRecord::Base
+  acts_as_revisable :generate_revision_class => true
 end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: rich-acts_as_revisable
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 1.0.0
 platform: ruby
 authors: 
-- Rich Cavanaugh of JamLab, LLC.
-- Stephen Caudill of JamLab, LLC.
+- Rich Cavanaugh
+- Stephen Caudill
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 -07:00
+date: 2009-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: 
-email: cavanaugh@fatjam.com
+email: rich@withoutscope.com
 executables: []
 
 extensions: []
@@ -56,7 +56,7 @@ files:
 - generators/revisable_migration/templates/migration.rb
 - rails/init.rb
 has_rdoc: true
-homepage: http://github.com/fatjam/acts_as_revisable/tree/master
+homepage: http://github.com/rich/acts_as_revisable/tree/master
 post_install_message: 
 rdoc_options: 
 - --main

data/lib/acts_as_revisable/acts/scoped_model.rb

@@ -1,75 +0,0 @@
-module FatJam
-  module ActsAsScopedModel
-    def self.included(base)
-      base.send(:extend, ClassMethods)
-    end
-    
-    module ClassMethods
-      SCOPED_METHODS = %w(construct_calculation_sql construct_finder_sql update_all delete_all destroy_all).freeze
-      
-      def call_method_with_static_scope(meth, args)
-        return send(meth, *args) unless self.scoped_model_enabled?
-        
-        with_scope(self.scoped_model_static_scope) do
-          send(meth, *args)
-        end
-      end
-      
-      SCOPED_METHODS.each do |m|
-        module_eval <<-EVAL
-          def #{m}_with_static_scope(*args)
-            call_method_with_static_scope(:#{m}_without_static_scope, args)
-          end
-        EVAL
-      end
-
-      def without_model_scope
-        return unless block_given?
-        
-        begin
-          self.scoped_model_enabled = false
-          rv = yield
-        ensure
-          self.scoped_model_enabled = true
-        end
-        
-        rv
-      end
-      
-      def disable_model_scope!
-        self.scoped_model_disable_count += 1
-      end
-      
-      def enable_model_scope!
-        self.scoped_model_disable_count -= 1
-      end
-      
-      def scoped_model_enabled?
-        self.scoped_model_disable_count == 0
-      end
-      
-      def scoped_model_enabled
-        self.scoped_model_enabled?
-      end
-      
-      def scoped_model_enabled=(value)
-        if value == false
-          disable_model_scope!
-        else
-          enable_model_scope!
-        end
-      end
-      
-      def acts_as_scoped_model(*args)
-        class << self
-          attr_accessor :scoped_model_static_scope, :scoped_model_disable_count   
-          SCOPED_METHODS.each do |m|   
-            alias_method_chain m.to_sym, :static_scope
-          end
-        end
-        self.scoped_model_disable_count = 0
-        self.scoped_model_static_scope = args.extract_options!
-      end
-    end
-  end
-end

data/lib/acts_as_revisable/clone_associations.rb

@@ -1,36 +0,0 @@
-# This module encapsulates the methods used by ActsAsRevisable
-# for cloning associations from one model to another.
-module FatJam
-  module ActsAsRevisable
-    module CloneAssociations
-      class << self
-        def clone_associations(from, to)
-          return unless from.descends_from_active_record? && to.descends_from_active_record?
-
-          to.revision_cloned_associations.each do |key|
-            assoc = from.reflect_on_association(key)
-            meth = "clone_#{assoc.macro.to_s}_association"
-            meth = "clone_association" unless respond_to? meth
-            send(meth, assoc, to)
-          end
-        end
-        
-        def clone_association(association, to)
-          options = association.options.clone
-          options[:foreign_key] ||= "revisable_original_id"
-          to.send(association.macro, association.name, options)
-        end
-        
-        def clone_belongs_to_association(association, to)
-          to.send(association.macro, association.name, association.options.clone)
-        end
-        
-        def clone_has_many_association(association, to)
-          options = association.options.clone
-          options[:association_foreign_key] ||= "revisable_original_id"
-          to.send(association.macro, association.name, options)
-        end
-      end
-    end
-  end
-end