has_moderated 1.0.beta → 1.0.beta2

data/README.rdoc

@@ -79,6 +79,7 @@ Be especially careful if you are moderating a has_many :through association. In
   has_moderated_association :bookshelves, :books
 
 == Manage moderations
+
 To see pending moderations, simply call
 
   Moderation.all
@@ -106,6 +107,18 @@ to discard (destroy) it, call
   
 Do not use moderation.destroy, because discard triggers certain callbacks which may be necessary.
 
+== Preview moderation
+
+You can see a preview of what a moderation will do. Right now, you can only preview changes to attributes, not associations. To create a preview of how a record will look after applying a moderation, use
+
+  record_preview = moderation.preview
+  
+This will return the record with modified attributes, but not saved to database. You can see what changed by looking at (provided by ActiveRecord)
+
+  record_preview.changes
+  
+Just be careful not to call record_preview.save, as this will create a new moderation record.
+
 == Bypassing moderation
 To bypass moderation (e.g. for admin users), wrap your code into without_moderation like so:
 

data/lib/has_moderated/moderated_attributes.rb

@@ -51,7 +51,7 @@ module HasModerated
     end
     
     module ApplyModeration
-      def self.apply(moderation, value)
+      def self.apply(moderation, value, do_save = true)
         if value[:attributes].present?
           rec = moderation.moderatable
           rec.without_moderation do
@@ -59,9 +59,11 @@ module HasModerated
               # bypass attr_accessible protection
               rec.send(attr_name.to_s+"=", attr_value)
             end
-            rec.save(:validate => false) # don't run validations
+            # don't run validations on save (were already ran when moderation was created)
+            rec.save(:validate => false) if do_save
           end
         end
+        rec
       end
     end
     

data/lib/has_moderated/moderation_model.rb

@@ -20,5 +20,9 @@ module HasModerated
       end
       self.destroy
     end
+    
+    def preview
+      HasModerated::ModeratedAttributes::ApplyModeration::apply(self, parsed_data, false)
+    end
   end
 end

data/lib/has_moderated/version.rb

@@ -1,3 +1,3 @@
 module HasModerated
-  VERSION = "1.0.beta"
+  VERSION = "1.0.beta2"
 end

data/test/dummy/log/development.log

@@ -7528,3 +7528,16 @@ Migrating to CreatePhotos (20120520215224)
    (0.0ms)  PRAGMA index_list("task_photos")
    (0.0ms)  PRAGMA index_list("tasks")
    (0.0ms)  PRAGMA index_list("tasks_jointable")
+DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from /Users/apple/rails/has_moderated/test/dummy/config/environment.rb:5)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to InitialSchema (20120520215008)
+Migrating to CreatePhotos (20120520215224)
+   (0.1ms)  select sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.0ms)  PRAGMA index_list("moderations")
+   (0.0ms)  PRAGMA index_list("photos")
+   (0.0ms)  PRAGMA index_list("subtasks")
+   (0.0ms)  PRAGMA index_list("task_connections")
+   (0.0ms)  PRAGMA index_list("task_photos")
+   (0.0ms)  PRAGMA index_list("tasks")
+   (0.0ms)  PRAGMA index_list("tasks_jointable")